成品入库修改5

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -1063,6 +1063,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             List<WmsProductPutRecords>  wmsProductPutRecords1=    wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords);
              if(wmsProductPutRecords1.size()>0){
                  wmsProductPut1.setRemark("1");//已经入库
+                 wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber());
              }else {
                  wmsProductPut1.setRemark("0");//未入库
              }
@@ -1072,6 +1073,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         if (wmsProductPut1.getAttr3()==null){
             wmsProductPut1.setAttr3(wmsProductPut1.getPlanQuantity().toString());
         }
+        wmsProductPut1.setPallet(wmsProductPut.getPallet());
         return wmsProductPut1;
     }
 
@@ -1118,7 +1120,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         //wms_product_put
         wmsProductPutk.setWorkOrder(wmsProductPut1.getWorkOrder());
         wmsProductPutk.setProductOrder(wmsProductPut1.getProductOrder());
-        wmsProductPutk.setFactoryCode(wmsProductPut1.getFactoryCode());
+        wmsProductPutk.setFactoryCode(wmsProductPut.getFactoryCode());
         wmsProductPutk.setWhCode(wmsProductPut1.getWhCode());//仓库编码
         wmsProductPutk.setWaCode(wmsProductPut1.getWaCode());//仓库编码
         wmsProductPutk.setProductName(wmsProductPut1.getProductName());
@@ -1132,9 +1134,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            BigDecimal planQuantity=    wmsProductPut2.getPlanQuantity();
            BigDecimal putQuantity=     wmsProductPut2.getPutQuantity();
            if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){
-               wmsProductPutk.setStatus("2");
-           }else {
                wmsProductPutk.setStatus("1");
+           }else {
+               wmsProductPutk.setStatus("2");
            }
            BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量
            wmsProductPut2.setPutQuantity(putQuantityT);
@@ -1142,7 +1144,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy());
            wmsProductPutMapper.updateWmsProductPut(wmsProductPut2);
        }else {
-           wmsProductPutk.setStatus("1");
+           wmsProductPutk.setStatus("2");
            wmsProductPutk.setSapStatus("0");
            wmsProductPutk.setAttr3(formattedDate);//
            wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy());
@@ -1157,7 +1159,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsProductPutRecords.setProductName(wmsProductPut1.getProductName());
             wmsProductPutRecords.setProductCode(wmsProductPut1.getProductCode());
             wmsProductPutRecords.setWhCode(wmsProductPut1.getWhCode());//仓库编码
-            wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//仓库编码
+            wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//库区编码
             wmsProductPutRecords.setId(IdUtils.fastSimpleUUID());
             wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode());
             wmsProductPutRecords.setSn(wmsProductPut1.getSn());
@@ -1171,6 +1173,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID());
             wmsFpStorageNewsSn.setFactoryCode(wmsProductPut.getFactoryCode());
             wmsFpStorageNewsSn.setWhCode(wmsProductPut1.getWhCode());//仓库编码
+            wmsFpStorageNewsSn.setWaCode(wmsProductPut1.getWaCode());
             wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode());
             wmsFpStorageNewsSn.setOrderNo(wmsProductPutk.getId());
             wmsFpStorageNewsSn.setProductCode(wmsProductPut1.getProductCode());
@@ -1187,18 +1190,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();
 
             wmsFpStorageNews.setWhCode(wmsProductPut1.getWhCode());//仓库编码
-            wmsFpStorageNews.setWlCode(wmsProductPut1.getWaCode());
+            wmsFpStorageNews.setWaCode(wmsProductPut1.getWaCode());
+            wmsFpStorageNews.setWlCode(wmsProductPut1.getWlCode());
             wmsFpStorageNews.setStorageType("成品");
             wmsFpStorageNews.setProductCode(wmsProductPut1.getProductCode());
             wmsFpStorageNews.setProductName(wmsProductPut1.getProductName());
-            wmsFpStorageNews.setFactoryCode(wmsProductPut1.getFactoryCode());
+            wmsFpStorageNews.setFactoryCode(wmsProductPut.getFactoryCode());
             wmsFpStorageNews.setActiveFlag("1");
             wmsFpStorageNews.setUserDefined1(wmsProductPut1.getUnitOfMeasure());
             List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
             wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
             wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
             wmsFpStorageNews.setCreateBy(wmsProductPut.getCreateBy());
-            wmsFpStorageNews.setCreateTime(new Date());
+            wmsFpStorageNews.setGmtCreate(new Date());
             if (wmsFpStorageNewsList.size() > 0) {
                 WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0);
                 BigDecimal amount = wmsFpStorageNews1.getAmount();