wms白坯部分代码修改6

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -292,13 +292,13 @@ public class WmsToWCSmissionController {
     /**
      * 用于白胚库内转储--库内托盘位置转移操作--
      *
-     * @param odsWhiteEmbryo
+     * @param wmsOdsEmStorageNewsSn
      * @return
      */
     @PostMapping("/WhiteWarehouseDump")
-    public AjaxResult WhiteWarehouseDump(@RequestBody OdsWhiteEmbryo odsWhiteEmbryo) {
+    public AjaxResult WhiteWarehouseDump(@RequestBody WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
         // OdsProcureOutOrder orderList = odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder);
-        String result=    iOdsWhiteEmbryoService.WhiteEmbryoOutbound(odsWhiteEmbryo);
+        String result=    iOdsWhiteEmbryoService.WhiteWarehouseDump(wmsOdsEmStorageNewsSn);
         return success(result);
     }
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsEmStorageNewsSn.java

@@ -41,6 +41,22 @@ public class WmsOdsEmStorageNewsSn extends BaseEntity {
     @Excel(name = "库位编码")
     private String wlCode;
 
+
+
+    /**
+     * 库位编码
+     */
+    @Excel(name = "目标库位编码")
+    private String tOwlCode;
+
+    public String gettOwlCode() {
+        return tOwlCode;
+    }
+
+    public void settOwlCode(String tOwlCode) {
+        this.tOwlCode = tOwlCode;
+    }
+
     /**
      * 入库单号
      */

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsSnMapper.java

@@ -60,4 +60,6 @@ public interface WmsOdsEmStorageNewsSnMapper {
     public int deleteWmsOdsEmStorageNewsSnByEmOrderInSnIds(Long[] emOrderInSnIds);
 
     WmsOdsEmStorageNewsSn selectWmsOdsEmStorageNewsSnBysn(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
+
+    WmsOdsEmStorageNewsSn selectWmsOdsEmStorageNewsSnBysnAndmaterialCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java

@@ -66,4 +66,6 @@ public interface IOdsWhiteEmbryoService {
     WmsOdsEmStorageNewsSn selectQueryTrayInfor(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
 
     String WhiteEmbryoOutbound(OdsWhiteEmbryo odsWhiteEmbryo);
+
+    String WhiteWarehouseDump(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
 }

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

@@ -216,4 +216,53 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService {
         }
         return result;
     }
+
+    @Override
+    public String WhiteWarehouseDump(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
+        String  result="成功";
+        DynamicDataSourceContextHolder.push("ds_" + wmsOdsEmStorageNewsSn.getFactoryCode());
+        WmsOdsEmStorageNewsSn   wmsOdsEmStorageNewsSn1=   wmsOdsEmStorageNewsSnMapper.selectWmsOdsEmStorageNewsSnBysnAndmaterialCode(wmsOdsEmStorageNewsSn);
+        //移动库存--先减后加
+        wmsOdsEmStorageNewsSn1.setActiveFlag("0");
+        //去掉明细
+        wmsOdsEmStorageNewsSnMapper.updateWmsOdsEmStorageNewsSn(wmsOdsEmStorageNewsSn1);
+        WmsOdsEmStorageNews wmsOdsEmStorageNews=  wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsByWlCode(wmsOdsEmStorageNewsSn);
+        BigDecimal  amount=  wmsOdsEmStorageNews.getAmount().subtract(wmsOdsEmStorageNewsSn.getAmount());
+        wmsOdsEmStorageNews.setAmount(amount);
+        wmsOdsEmStorageNewsMapper.updateWmsOdsEmStorageNews(wmsOdsEmStorageNews);
+        //
+        WmsOdsEmStorageNewsSn   wmsOdsEmStorageNewsSn2=new  WmsOdsEmStorageNewsSn();
+        wmsOdsEmStorageNewsSn2.setAmount(wmsOdsEmStorageNewsSn.getAmount());
+        wmsOdsEmStorageNewsSn2.setWlCode(wmsOdsEmStorageNewsSn.gettOwlCode());
+        wmsOdsEmStorageNewsSn2.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode());
+        wmsOdsEmStorageNewsSn2.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc());
+        wmsOdsEmStorageNewsSn2.setSn(wmsOdsEmStorageNewsSn.getSn());
+        wmsOdsEmStorageNewsSn2.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy());
+        wmsOdsEmStorageNewsSn2.setGmtCreate(new Date());
+        wmsOdsEmStorageNewsSn2.setActiveFlag("1");
+        wmsOdsEmStorageNewsSn2.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode());
+        wmsOdsEmStorageNewsSnMapper.insertWmsOdsEmStorageNewsSn(wmsOdsEmStorageNewsSn2);
+        WmsOdsEmStorageNews     wmsOdsEmStorageNews1=new    WmsOdsEmStorageNews();
+
+        wmsOdsEmStorageNews1.setWlCode(wmsOdsEmStorageNewsSn.gettOwlCode());
+        wmsOdsEmStorageNews1.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode());
+        wmsOdsEmStorageNews1.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc());
+        wmsOdsEmStorageNews1.setUserDefined1(wmsOdsEmStorageNews.getUserDefined1());
+        wmsOdsEmStorageNews1.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode());
+        wmsOdsEmStorageNews1.setActiveFlag("1");
+        List<WmsOdsEmStorageNews> wmsOdsEmStorageNewsList=    wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsList(wmsOdsEmStorageNews1);
+
+        if (wmsOdsEmStorageNewsList.size()>0){
+            WmsOdsEmStorageNews wmsOdsEmStorageNews2=  wmsOdsEmStorageNewsList.get(0);
+            BigDecimal  newAmount=    wmsOdsEmStorageNews2.getAmount();
+            wmsOdsEmStorageNews2.setAmount(newAmount.add(wmsOdsEmStorageNewsSn.getAmount()));
+            wmsOdsEmStorageNewsMapper.updateWmsOdsEmStorageNews(wmsOdsEmStorageNews2);
+        }else {
+            wmsOdsEmStorageNews1.setStorageId(IdUtils.fastSimpleUUID());
+            wmsOdsEmStorageNews1.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy());
+            wmsOdsEmStorageNews1.setGmtCreate(new Date());
+            wmsOdsEmStorageNewsMapper.insertWmsOdsEmStorageNews(wmsOdsEmStorageNews1);
+        }
+        return result;
+    }
 }

op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsSnMapper.xml

@@ -194,4 +194,9 @@
         <include refid="selectWmsOdsEmStorageNewsSnVo"/>
         WHERE	sn=#{sn}	AND	active_flag='1'
     </select>
+
+    <select id="selectWmsOdsEmStorageNewsSnBysnAndmaterialCode"    resultMap="WmsOdsEmStorageNewsSnResult">
+        <include refid="selectWmsOdsEmStorageNewsSnVo"/>
+        WHERE	sn=#{sn}	AND	active_flag='1' AND material_code=#{materialCode}
+    </select>
 </mapper>