yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加规格

Browse Source
jg-waiwang-pro
vayne 3 months ago
parent eeb60f39e1
commit aca6b916ae
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
Unescape View File

@ -815,10 +815,12 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
if(inventoryList != null && inventoryList.size() > 0){
inventoryEntity = inventoryList.get(0);
inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add((entitys.getDeliveryNum())));//库存数量
inventoryEntity.setSpec(entitys.getSpec());
}else{
inventoryEntity.setProductId(entitys.getProductId());
inventoryEntity.setCode(productWarehouseEntity.getCode());
inventoryEntity.setName(productWarehouseEntity.getName());
inventoryEntity.setSpec(entitys.getSpec());
inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());
inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());

2
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
Unescape View File

@ -637,9 +637,11 @@ public class WarehousingStorageController {
if(inventoryList != null && inventoryList.size() > 0){
inventoryEntity = inventoryList.get(0);
inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add(new BigDecimal(warehousingStorageProductModel.getStorageNumber())));//库存数量
inventoryEntity.setSpec(warehousingStorageProductModel.getSpec());
}else{
inventoryEntity.setProductId(warehousingStorageProductModel.getProductId());
inventoryEntity.setCode(productWarehouseEntity.getCode());
inventoryEntity.setSpec(warehousingStorageProductModel.getSpec());
inventoryEntity.setName(productWarehouseEntity.getName());
inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());

63
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
Unescape View File

@ -15,8 +15,10 @@ import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.service.*;
import jnpf.util.JsonUtil;
import jnpf.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -82,6 +84,8 @@ public class YunguanInterfaceController {
private WorkOrderPrimaryService workOrderPrimaryService;
@Autowired
private WorkOrderProductService workOrderProductService;
@Autowired
private RedisUtil redisUtil;
/**
* 运管推送客户数据到智慧
*
@ -792,7 +796,7 @@ public class YunguanInterfaceController {
String str = new String(bytes, StandardCharsets.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(str);
if (ObjectUtil.isNotEmpty(jsonObject)){
if (jsonObject.get("type").equals("采购订单头")){
if (jsonObject.get("TYPE").equals("采购订单头")){
YunguanPurchaseOrderModel yunguanPurchaseOrderModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseOrderModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
@ -805,7 +809,7 @@ public class YunguanInterfaceController {
businessOrderService.updateById(businessOrderEntity);
}
}
} else if (jsonObject.get("type").equals("采购订单行")) {
} else if (jsonObject.get("TYPE").equals("采购订单行")) {
YunguanPurchaseOrderProductModel yunguanPurchaseOrderProductModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderProductModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseOrderProductModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
@ -824,7 +828,7 @@ public class YunguanInterfaceController {
}
}
}
} else if (jsonObject.get("type").equals("销售订单头")) {
} else if (jsonObject.get("TYPE").equals("销售订单头")) {
YunguanSaleOrderModel yunguanSaleOrderModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOrderModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
@ -837,7 +841,7 @@ public class YunguanInterfaceController {
businessOrderService.updateById(businessOrderEntity);
}
}
} else if (jsonObject.get("type").equals("销售订单行")) {
} else if (jsonObject.get("TYPE").equals("销售订单行")) {
YunguanSaleOrderProductModel yunguanSaleOrderProductModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderProductModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOrderProductModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
@ -856,13 +860,38 @@ public class YunguanInterfaceController {
}
}
}
} else if (jsonObject.get("type").equals("采购入库")) {
} else if (jsonObject.get("TYPE").equals("采购入库")) {
YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = JsonUtil.getJsonToBean(str,YunguanPurchaseInBoundModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseInBoundModel.getRECEIPT_NO())){
QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,yunguanPurchaseInBoundModel.getRECEIPT_NO());
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageEntity)){
//更新运管标志
String inBound = yunguanPurchaseInBoundModel.getRECEIPT_NO();
boolean inBoundNoExists = redisUtil.exists(inBound);
if (inBoundNoExists){
QueryWrapper<WarehousingStorageProductEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
long count = warehousingStorageProductService.count(countQueryWrapper); //入库单子表size
String s = redisUtil.getString(inBound).toString();
List<String> list = Arrays.asList(s.split(","));
long lenght = list.size();
if (lenght < count){
list.add(yunguanPurchaseInBoundModel.getREAD_FLAG());
redisUtil.insert(inBound,list);
}else if (lenght == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
}
}else {
redisUtil.insert(inBound, yunguanPurchaseInBoundModel.getREAD_FLAG());
}
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN());
@ -872,16 +901,16 @@ public class YunguanInterfaceController {
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
if (!warehousingStorageEntity.getYunguanMark().equals("N")){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
}
if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
}
}
} else if (jsonObject.get("type").equals("销售出库")) {
} else if (jsonObject.get("TYPE").equals("销售出库")) {
YunguanSaleOutBoundModel yunguanSaleOutBoundModel = JsonUtil.getJsonToBean(str,YunguanSaleOutBoundModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOutBoundModel.getPROD_ZL())){
QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper = new QueryWrapper<>();
@ -905,7 +934,7 @@ public class YunguanInterfaceController {
}
}
}
} else if (jsonObject.get("type").equals("采购结算头")) {
} else if (jsonObject.get("TYPE").equals("采购结算头")) {
YunguanPurchaseSettlementModel yunguanPurchaseSettlementModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseSettlementModel.getACCOUNT_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
@ -918,7 +947,7 @@ public class YunguanInterfaceController {
cwsettlementService.updateById(cwsettlementEntity);
}
}
} else if (jsonObject.get("type").equals("采购结算行")) {
} else if (jsonObject.get("TYPE").equals("采购结算行")) {
YunguanPurchaseSettlementProductModel yunguanPurchaseSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementProductModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseSettlementProductModel.getACCOUNT_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
@ -937,7 +966,7 @@ public class YunguanInterfaceController {
}
}
}
} else if (jsonObject.get("type").equals("销售结算头")) {
} else if (jsonObject.get("TYPE").equals("销售结算头")) {
YunguanSaleSettlementModel yunguanSaleSettlementModel = JsonUtil.getJsonToBean(str,YunguanSaleSettlementModel.class);
if (StringUtils.isNotEmpty(yunguanSaleSettlementModel.getINVOICE_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
@ -950,7 +979,7 @@ public class YunguanInterfaceController {
cwsettlementService.updateById(cwsettlementEntity);
}
}
} else if (jsonObject.get("type").equals("销售结算行")) {
} else if (jsonObject.get("TYPE").equals("销售结算行")) {
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanSaleSettlementProductModel.class);
if (StringUtils.isNotEmpty(yunguanSaleSettlementProductModel.getINVOICE_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
@ -969,7 +998,7 @@ public class YunguanInterfaceController {
}
}
}
} else if (jsonObject.get("type").equals("生产加工")) {
} else if (jsonObject.get("TYPE").equals("生产加工")) {
YunguanProductProcessModel yunguanProductProcessModel = JsonUtil.getJsonToBean(str,YunguanProductProcessModel.class);
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getTASK_NO())){
QueryWrapper<WorkOrderEntity> workOrderQueryWrapper = new QueryWrapper<>();

Write Preview
Loading…
Cancel
Save