java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改转库存品

dev-warehouse
caoyizhong 2 years ago
parent
f3da51a4db
commit
4bc7998cde
4 changed files with 158 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
  2. 61
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
  3. 98
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  4. 106
      doc/dpm/物流租户系统.pdma.json

17
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
Unescape View File

@ -112,10 +112,15 @@ public class DistributionParcelListEntity extends TenantEntity {
@ApiModelProperty(value = "三级品")
private String thirdProduct;
/**
* 物料
* 物料Id
*/
@ApiModelProperty(value = "物料")
@ApiModelProperty(value = "物料ID")
private String material;
/**
* 物料名称
*/
@ApiModelProperty(value = "物料名称")
private String materialName;
/**
* 数量
*/
@ -130,6 +135,12 @@ public class DistributionParcelListEntity extends TenantEntity {
* 在库订单ID
*/
@ApiModelProperty(value = "在库订单ID")
private String stockArticleId;
private Long stockArticleId;
/**
* 服务号
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
}

61
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
Unescape View File

@ -18,6 +18,7 @@ package com.logpm.distribution.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -25,6 +26,7 @@ import java.util.Date;
import java.util.List;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.springblade.core.tenant.mp.TenantEntity;
/**
@ -37,6 +39,8 @@ import org.springblade.core.tenant.mp.TenantEntity;
@TableName("logpm_distribution_stock_list")
@ApiModel(value = "DistributionStockList对象", description = "库存品管理")
@EqualsAndHashCode(callSuper = true)
@AllArgsConstructor
@NoArgsConstructor
public class DistributionStockListEntity extends TenantEntity {
/**
@ -94,6 +98,11 @@ public class DistributionStockListEntity extends TenantEntity {
*/
@ApiModelProperty(value = "货物编号")
private String cargoNumber;
/**
* 货物ID
*/
@ApiModelProperty(value = "货物id")
private String material;
/**
* 仓库
*/
@ -160,6 +169,11 @@ public class DistributionStockListEntity extends TenantEntity {
*/
@ApiModelProperty(value = "发运车次")
private String despatch;
/**
* 服务号
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
/**
* 预约数量
@ -167,6 +181,53 @@ public class DistributionStockListEntity extends TenantEntity {
@ApiModelProperty(value = "预约数量")
@TableField(exist = false)
private Integer reservationNum;
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String unit;
/**
* 仓库名称
*/
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
/**
* 门店ID
*/
@ApiModelProperty(value = "门店ID")
private String storeId;
/**
* 所属商场
*/
@ApiModelProperty(value = "所属商场")
private String shoppingMall;
/**
* 商场编码
*/
@ApiModelProperty(value = "商场编码")
private String marketCode;
/**
* 商场名称
*/
@ApiModelProperty(value = "商场名称")
private String marketName;
/**
* 门店编码
*/
@ApiModelProperty(value = "门店编码")
private String storeCode;
/**
* 门店名称
*/
@ApiModelProperty(value = "门店名称")
private String storeName;
/**
* 冻结数量
*/
@ApiModelProperty(value = "冻结数量")
private Integer quantityOccupied;
}

98
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -85,15 +86,30 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
public Boolean saveStock(String ids) {
try{
if(StringUtils.isNotBlank(ids)){
String[] split = ids.split(",");
for (String s : split) {
addStockList(s);
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
stockArticleEntity.setId(Long.parseLong(s));
stockArticleEntity.setGenre(2);
baseMapper.updateById(stockArticleEntity);
//查询
List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.in(DistributionParcelListEntity::getStockArticleId, ids.split(","))
);
if(list1.size() > 0){
list1.forEach( i ->{
//查询库存品里面有没有一样的
// List<DistributionStockListEntity> list = distributionStockListService.list(Wrappers.<DistributionStockListEntity>query().lambda()
// .eq(DistributionStockListEntity::getServiceNumber,i.getServiceNumber())
// .eq(DistributionStockListEntity::getMaterial,i.getMaterial())
// );
// 添加库存品信息
addStockList(i,1);
});
String[] split = ids.split(",");
for (int i = 0; i < split.length; i++) {
//修改订单状态
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
stockArticleEntity.setId(Long.parseLong(split[i]));
stockArticleEntity.setGenre(2);
baseMapper.updateById(stockArticleEntity);
}
return true;
}
return true;
}
return false;
}catch (Exception e){
@ -149,27 +165,26 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
@Transactional(rollbackFor = Exception.class)
public Boolean saveStockRow(DistributionStockArticleDTO distributionStockArticleDTO) {
//修改包件状态
String[] split = distributionStockArticleDTO.getIds().split(",");
List<DistributionStockEntity> stockEntityList = new ArrayList<>();
String[] split = distributionStockArticleDTO.getIds().split(","); //选择的包件
// List<DistributionStockEntity> stockEntityList = new ArrayList<>();
for (String s : split) {
//查询包件信息
List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getId, s)
DistributionParcelListEntity one = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
.in(DistributionParcelListEntity::getId, s)
);
DistributionParcelListEntity distributionParcelListEntity = list.get(0);
DistributionParcelListEntity distributionParcelListEntity = one;
distributionParcelListEntity.setConditions(2);
distributionParcelListService.updateById(distributionParcelListEntity);
//添加库存品订单
List<DistributionStockListEntity> list1 = distributionStockListService.list(Wrappers.<DistributionStockListEntity>query().lambda()
.eq(DistributionStockListEntity::getStockArticleId, distributionStockArticleDTO.getId())
);
DistributionStockArticleEntity aLong = null;
if(list1.size() > 0){
//存在
}else{
//不存在
aLong = addStockList(distributionStockArticleDTO.getId().toString());
addStockList(one,2);
}
// String s1 = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "7");
@ -195,30 +210,45 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
/**
*
* @param s 订单id
* @param distributionParcelList 包件信息
* @return
*/
public DistributionStockArticleEntity addStockList(String s){
public DistributionStockArticleEntity addStockList(DistributionParcelListEntity distributionParcelList,Integer qu){
//查询在库订单信息
DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(s);
DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(distributionParcelList.getStockArticleId());
DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
distributionStockListEntity.setStockArticleId(Long.parseLong(s));
distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering());
// distributionStockListEntity.setIncomingBatch(); //入库批次号
distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods());
// distributionStockListEntity.setCargoNumber(); //货物编号
distributionStockListEntity.setWarehouse(distributionStockArticleEntity.getWarehouse());
// distributionStockListEntity.setMarket(); //商场
// distributionStockListEntity.setCargoUnit(distributionStockArticleEntity.get); //货物单位
// distributionStockListEntity.setShop(); //门店
// distributionStockListEntity.setStorageLocation(); //库位信息
distributionStockListEntity.setMallName(distributionStockArticleEntity.getMallName());
distributionStockListEntity.setQuantityStock(distributionStockArticleEntity.getHandQuantity());
distributionStockListEntity.setOutboundQuantity(distributionStockArticleEntity.getHandQuantity());
// distributionStockListEntity.setDespatch(distributionStockArticleEntity.get);//车次号
distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering()); //订单自编号
distributionStockListEntity.setIncomingBatch("入库批次号"); //入库批次号
distributionStockListEntity.setServiceNumber("服务号"); //服务号
distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods()); //货物名称
distributionStockListEntity.setCargoNumber("货物编号"); //货物编号
distributionStockListEntity.setWarehouse(distributionStockArticleEntity.getWarehouse()); //仓库
distributionStockListEntity.setMarket("商场"); //商场
distributionStockListEntity.setCargoUnit("货物单位"); //货物单位
distributionStockListEntity.setShop("门店"); //门店
distributionStockListEntity.setStorageLocation("库位信息"); //库位信息
distributionStockListEntity.setMallName(distributionStockArticleEntity.getMallName()); //商场名称
distributionStockListEntity.setQuantityStock(distributionStockArticleEntity.getHandQuantity()); //库存数量
distributionStockListEntity.setOutboundQuantity(distributionStockArticleEntity.getHandQuantity()); //出库数量
distributionStockListEntity.setDespatch("车次号");//车次号
distributionStockListEntity.setUnit("单位");//单位
distributionStockListEntity.setWarehouseName("仓库名称");//仓库名称
distributionStockListEntity.setStoreId("门店ID");//门店ID
distributionStockListEntity.setShoppingMall("所属商场");//所属商场
distributionStockListEntity.setShoppingMall("所属商场");//所属商场
distributionStockListEntity.setMarketCode("商场编码");//商场编码
distributionStockListEntity.setMarketName("商场名称");//商场名称
distributionStockListEntity.setStoreCode("门店编码");//门店编码
distributionStockListEntity.setStoreName("门店名称");//门店名称
distributionStockListEntity.setFactory("工厂车次");//工厂车次
distributionStockListEntity.setCategory("品分类");//品分类
distributionStockListEntity.setMaterial("货物ID");//货物ID
distributionStockListEntity.setStoreName("门店名称");//门店名称
distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
distributionStockListEntity.setQuantityOccupied(0);//冻结数量
distributionStockListService.save(distributionStockListEntity);
return distributionStockArticleEntity;
}

106
doc/dpm/物流租户系统.pdma.json
Unescape View File

@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2023-3-27 13:32:56",
"updatedTime": "2023-7-6 13:32:26",
"updatedTime": "2023-7-6 14:54:49",
"dbConns": [],
"profile": {
"default": {
@ -54998,6 +54998,23 @@
"id": "59A2D84D-23BF-4A85-8E59-89F58456ADA4",
"extProps": {}
},
{
"defKey": "quantity_occupied",
"defName": "占用数量",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "18CF637D-B233-4798-B5E5-35F7FC4D0CB9"
},
{
"defKey": "outbound_quantity",
"defName": "出库数量",
@ -55206,74 +55223,6 @@
"id": "2D7281AA-832A-4D3C-9631-C0EA170443A5",
"extProps": {}
},
{
"defKey": "material_code",
"defName": "物料编码",
"comment": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "74B0F53C-B9F0-4FAE-AF0C-8892C122C836"
},
{
"defKey": "material_name",
"defName": "物料名称",
"comment": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "79C5DFA3-22C8-4E04-B2A3-2AE80958FC84"
},
{
"defKey": "Inventory_quantity",
"defName": "库存数量",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "6ABEABC9-7B8F-4C63-B5AE-14226210813A"
},
{
"defKey": "quantity_occupied",
"defName": "占用数量",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "18CF637D-B233-4798-B5E5-35F7FC4D0CB9"
},
{
"defKey": "unit",
"defName": "单位",
@ -55291,23 +55240,6 @@
"domain": "",
"id": "3833F299-6C9C-41BB-92B8-1EAC5CD6BC5F"
},
{
"defKey": "position",
"defName": "存放位置",
"comment": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "EE087EA2-0148-41D1-92B6-B76A9E8D193B"
},
{
"defKey": "warehouse_name",
"defName": "仓库名称",
@ -56193,4 +56125,4 @@
}
}
]
}
}
Write Preview
Loading…
Cancel
Save