|
|
@@ -219,27 +219,33 @@ public class WorkerStockLogic {
|
|
|
if (count > 0) {
|
|
|
throw new RemoteServiceException(tipsGoodsName + "编号【" + goodsId + "】的库存记录已存在于系统，导入失败");
|
|
|
}
|
|
|
- WorkerStockDTO workerStockDTO = new WorkerStockDTO();
|
|
|
- workerStockDTO.setCompanyWechatId(adminUser.getCompanyWechatId());
|
|
|
- workerStockDTO.setCompanyWechatName(adminUser.getCompanyName());
|
|
|
- workerStockDTO.setIdentity(user.getIdCard());
|
|
|
- workerStockDTO.setWorkerId(user.getWorkerNumber());
|
|
|
- workerStockDTO.setWorkerName(user.getNickName());
|
|
|
- workerStockDTO.setSdate(curDate);
|
|
|
- workerStockDTO.setGoodsId(goodsId);
|
|
|
- workerStockDTO.setGoodsName(websitGoods.getGoodsName());
|
|
|
- workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
|
|
|
- workerStockDTO.setUnitName(websitGoods.getGoodsSalesUnit());
|
|
|
- workerStockDTO.setRef(idStr);
|
|
|
- workerStockDTO.setRefType("库存导入");
|
|
|
- workerStockDTO.setPartsAttr(PartsAttrEnum.OLD.getKey());
|
|
|
- workerStockDTO.setChangeQty(new BigDecimal(stock));
|
|
|
- workerStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());
|
|
|
- workerStockDTO.setFlag(WorkerStockFlagEnum.INIT.getKey());
|
|
|
- workerStockDTO.setObj("师傅");
|
|
|
- workerStockDTO.setWorkerOrderNo("");
|
|
|
- workerStockDTO.setOperateBy(adminUser.getJoinNickName());
|
|
|
- workerStockDTO.setOperateTime(curDate);
|
|
|
+
|
|
|
+ if (new BigDecimal(stock).compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ WorkerStockDTO workerStockDTO = new WorkerStockDTO();
|
|
|
+ workerStockDTO.setCompanyWechatId(adminUser.getCompanyWechatId());
|
|
|
+ workerStockDTO.setCompanyWechatName(adminUser.getCompanyName());
|
|
|
+ workerStockDTO.setIdentity(user.getIdCard());
|
|
|
+ workerStockDTO.setWorkerId(user.getWorkerNumber());
|
|
|
+ workerStockDTO.setWorkerName(user.getNickName());
|
|
|
+ workerStockDTO.setSdate(curDate);
|
|
|
+ workerStockDTO.setGoodsId(goodsId);
|
|
|
+ workerStockDTO.setGoodsName(websitGoods.getGoodsName());
|
|
|
+ workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
|
|
|
+ workerStockDTO.setUnitName(websitGoods.getGoodsSalesUnit());
|
|
|
+ workerStockDTO.setRef(idStr);
|
|
|
+ workerStockDTO.setRefType("库存导入");
|
|
|
+ workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
|
|
|
+ workerStockDTO.setChangeQty(new BigDecimal(stock));
|
|
|
+ workerStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());
|
|
|
+ workerStockDTO.setFlag(WorkerStockFlagEnum.INIT.getKey());
|
|
|
+ workerStockDTO.setObj("师傅");
|
|
|
+ workerStockDTO.setWorkerOrderNo("");
|
|
|
+ workerStockDTO.setOperateBy(adminUser.getJoinNickName());
|
|
|
+ workerStockDTO.setOperateTime(curDate);
|
|
|
+ workerStockDTOS.add(workerStockDTO);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if (new BigDecimal(oldQty).compareTo(BigDecimal.ZERO) > 0) {
|
|
|
WorkerStockDTO workerStockDTO2 = new WorkerStockDTO();
|
|
|
workerStockDTO2.setCompanyWechatId(adminUser.getCompanyWechatId());
|
|
|
@@ -254,7 +260,7 @@ public class WorkerStockLogic {
|
|
|
workerStockDTO2.setUnitName(websitGoods.getGoodsSalesUnit());
|
|
|
workerStockDTO2.setRef(idStr);
|
|
|
workerStockDTO2.setRefType("库存导入");
|
|
|
- workerStockDTO2.setPartsAttr(PartsAttrEnum.NEW.getKey());
|
|
|
+ workerStockDTO2.setPartsAttr(PartsAttrEnum.OLD.getKey());
|
|
|
workerStockDTO2.setChangeQty(new BigDecimal(oldQty));
|
|
|
workerStockDTO2.setDirectFlag(DirectFlagEnum.ADD.getKey());
|
|
|
workerStockDTO2.setFlag(WorkerStockFlagEnum.INIT.getKey());
|
|
|
@@ -262,8 +268,9 @@ public class WorkerStockLogic {
|
|
|
workerStockDTO2.setWorkerOrderNo("");
|
|
|
workerStockDTO2.setOperateBy(adminUser.getJoinNickName());
|
|
|
workerStockDTO2.setOperateTime(curDate);
|
|
|
+ workerStockDTOS.add(workerStockDTO2);
|
|
|
}
|
|
|
- workerStockDTOS.add(workerStockDTO);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
// 开始处理库存
|
