Merge remote-tracking branch 'origin/develop' into develop

tongzhonghao
2 parents 59dfd90f 1f2d3bab
Showing 4 changed files with 51 additions and 46 deletions
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/resources/templates/inventory/inventoryHeader/conformContainer.html
@@ -320,17 +320,17 @@ public class InventoryHeaderController extends BaseController
     }
     /**
      * 合托保存
-     * @param destContainerCode 原容器
-     * @param destContainerCode 目的容器
-     * detailIdList ，原容器下面的库存详情id
+     * @param orgLocationCode 原库位
+     * @param destLocationCode 目的库位
+     * detailIdList ，原库位下面的库存详情id
      * @return
      */
     @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.UPDATE)
     @PostMapping("/conformContainerSave")
     @ResponseBody
-    public AjaxResult conformContainerSave(String orgContainerCode, String destContainerCode, String detailIdList)
+    public AjaxResult conformContainerSave(String orgLocationCode, String destLocationCode, String detailIdList)
     {
-        return inventoryHeaderService.conformContainerSave(orgContainerCode, destContainerCode,detailIdList);
+        return inventoryHeaderService.conformContainerSave(orgLocationCode, destLocationCode,detailIdList);
     }
@@ -67,7 +67,7 @@ public interface InventoryHeaderService extends IService&lt;InventoryHeader&gt; {
     List<Integer> cycleCountInventoryHeader();
-    AjaxResult conformContainerSave(String orgContainerCode, String destContainerCode, String detailIdList);
+    AjaxResult conformContainerSave(String orgLocationCode, String destLocationCode, String detailIdList);
 }
@@ -447,27 +447,30 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
     /**
      * 合托，将原容器物料移到目的容器，可以整个容器全部移到目的容器，也可以其中一分部移动
      * 记录库存交易,判断明细不能是锁定状态(详情表锁状态没用到，暂时没判断)
-     * @param orgContainerCode 原容器
-     * @param destContainerCode 目的容器
+     * @param orgLocationCode 原容器
+     * @param destLocationCode 目的容器
      * @param detailIdList 库存详情id
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult conformContainerSave(String orgContainerCode, String destContainerCode, String detailIdList) {
-        if(StringUtils.isEmpty(orgContainerCode)||StringUtils.isEmpty(destContainerCode)){
-            return AjaxResult.error("原容器，目的容器不能为空");
+    public AjaxResult conformContainerSave(String orgLocationCode, String destLocationCode, String detailIdList) {
+        if(StringUtils.isEmpty(orgLocationCode)||StringUtils.isEmpty(destLocationCode)){
+            return AjaxResult.error("原库位，目的库位不能为空");
         }
         // 判断原容器、目的容器是否存在库存里
-        InventoryHeader inventoryHeader=checkContainer(orgContainerCode);
-        InventoryHeader inventoryHeader1=checkContainer(destContainerCode);
+        InventoryHeader inventoryHeader=checkContainer(orgLocationCode);
+        InventoryHeader inventoryHeader1=checkContainer(destLocationCode);
         if(inventoryHeader==null){
-            return AjaxResult.error("原容器不存在库存");
+            return AjaxResult.error("原库位不存在库存");
         }
         if(inventoryHeader1==null){
-            return AjaxResult.error("目的容器不存在库存");
+            return AjaxResult.error("目的库位不存在库存");
+        }
+        if(inventoryHeader.getId().equals(inventoryHeader1.getId())){
+            return AjaxResult.error("目的库位库存不能和原库位库存同一个");
         }
-        List<InventoryDetail> list=getDetailByContainerCode(orgContainerCode);
+        List<InventoryDetail> list=getDetailByContainerCode(orgLocationCode);
         if(null==list||list.size()==0){
             return AjaxResult.error("原容器不存在库存");
         }
@@ -483,7 +486,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
                 for(int a=0;a<str.length;a++){
                     Integer detailid=Integer.valueOf(str[a]);
                     if(detail.getId().equals(detailid)){
-                        saveInvDetail(detail,destContainerCode,inventoryHeader1);
+                        saveInvDetail(detail,destLocationCode,inventoryHeader1);
                     }
                 }
             }
@@ -492,20 +495,20 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             }
         }else{
             for (InventoryDetail detail:list){
-                saveInvDetail(detail,destContainerCode,inventoryHeader1);
+                saveInvDetail(detail,destLocationCode,inventoryHeader1);
             }
         }
         //修改库存主表
-        updateInventoryHeader(orgContainerCode);
-        updateInventoryHeader(destContainerCode);
+        updateInventoryHeader(orgLocationCode);
+        updateInventoryHeader(destLocationCode);
         return AjaxResult.success();
     }
     //保存库存交易表，修改库存详情
-    public void saveInvDetail(InventoryDetail detail,String destContainerCode,InventoryHeader inventoryHeader1){
+    public void saveInvDetail(InventoryDetail detail,String destLocationCode,InventoryHeader inventoryHeader1){
         //保存库存交易
         saveInventoryTransaction(detail,true);
-        detail.setContainerCode(destContainerCode);
-        detail.setLocationCode(inventoryHeader1.getLocationCode());
+        detail.setLocationCode(destLocationCode);
+        detail.setContainerCode(inventoryHeader1.getContainerCode());
         detail.setInventoryHeaderId(inventoryHeader1.getId());
         detail.setLastUpdated(new Date());
         detail.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -514,27 +517,27 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         saveInventoryTransaction(detail,false);
     }
     //根据容器检查库存主表是否有数量
-    public InventoryHeader checkContainer(String orgContainerCode){
+    public InventoryHeader checkContainer(String orgLocationCode){
         boolean result=false;
         LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(InventoryHeader::getContainerCode, orgContainerCode);
+        lambdaQueryWrapper.eq(InventoryHeader::getLocationCode, orgLocationCode);
         lambdaQueryWrapper.gt(InventoryHeader::getTotalQty,0);
         InventoryHeader inventoryHeader=this.getOne(lambdaQueryWrapper);
         return inventoryHeader;
     }
     //根据容器查询库存详情列表
-    public List<InventoryDetail> getDetailByContainerCode(String orgContainerCode){
+    public List<InventoryDetail> getDetailByContainerCode(String orgLocationCode){
         LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(InventoryDetail::getContainerCode, orgContainerCode);
+        lambdaQueryWrapper.eq(InventoryDetail::getLocationCode, orgLocationCode);
         List<InventoryDetail> list=inventoryDetailService.list(lambdaQueryWrapper);
         return list;
     }
     //根据容器修改库存主表
-    public void updateInventoryHeader(String orgContainerCode){
-        List<InventoryDetail> list=getDetailByContainerCode(orgContainerCode);
+    public void updateInventoryHeader(String orgLocationCode){
+        List<InventoryDetail> list=getDetailByContainerCode(orgLocationCode);
         int qty=0;
         LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(InventoryHeader::getContainerCode, orgContainerCode);
+        lambdaQueryWrapper.eq(InventoryHeader::getLocationCode, orgLocationCode);
         InventoryHeader inventoryHeader=this.getOne(lambdaQueryWrapper);
         if(list==null||list.size()==0){
             this.removeById(inventoryHeader);
@@ -5,20 +5,22 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-task-emptyIn">
-        <span style="color:red;margin-left:25%">*如果不勾选明细，则默认该容器明细全部转移到目的容器</span>
+        <span style="color:red;margin-left:25%">*如果不勾选明细，则默认该库位明细全部转移到目的容器</span>
         <div class="form-group">
-            <label class="col-sm-3 control-label">原容器编码：</label>
+            <label class="col-sm-3 control-label">原库位编码：</label>
             <div class="col-sm-6">
-                <input id="orgContainerCode" name="orgContainerCode" class="form-control" type="text" >
+                <input id="orgLocationCode" name="orgLocationCode" class="form-control" type="text" >
+                <!--<input id="orgContainerCode" name="orgContainerCode" class="form-control" type="text" >-->
             </div>
             <input type="hidden" id="detailIdList" name="detailIdList">
             <button type="button" class="btn btn-primary" onclick="selectMaterial()">选取明细</button>
             <button type="button" class="btn btn-primary" onclick="clearSelect()">清空明细</button>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">目的容器：</label>
+            <label class="col-sm-3 control-label">目的库位：</label>
             <div class="col-sm-8">
-                <input id="destContainerCode" name="destContainerCode" class="form-control" type="text" >
+                <input id="destLocationCode" name="destLocationCode" class="form-control" type="text">
+                <!--<input id="destContainerCode" name="destContainerCode" class="form-control" type="text">-->
             </div>
         </div>
         <div class="col-sm-12 select-info" id="selecttable" >
@@ -43,16 +45,16 @@
         $("#detailIdList").val('');
     }
     function selectMaterial(){
-        var orgContainerCode=$("#orgContainerCode").val();
-        if(orgContainerCode==''||orgContainerCode==undefined){
-            $.modal.alertError("请填写原容器编码");
+        var orgLocationCode=$("#orgLocationCode").val();
+        if(orgLocationCode==''||orgLocationCode==undefined){
+            $.modal.alertError("请填写原库位编码");
             return;
         }
         $.ajax({
             url:prefix + '/inventoryDetailLook',
             type:"post",
             data:{
-                "containerCode":orgContainerCode,
+                "locationCode":orgLocationCode,
             },
             success:function (value) {
                 console.log(value)
@@ -183,14 +185,14 @@
     $("#form-task-emptyIn").validate({
         submitHandler: function(form) {
-            var orgContainerCode=$("#orgContainerCode").val();
-            var destContainerCode=$("#destContainerCode").val();
-            if(orgContainerCode==''||destContainerCode==''){
-                $.modal.alertError("请填写原容器编码和目的容器编号");
+            var orgLocationCode=$("#orgLocationCode").val();
+            var destLocationCode=$("#destLocationCode").val();
+            if(orgLocationCode==''||destLocationCode==''){
+                $.modal.alertError("请填写原库位编码和目的库位编号");
                 return;
             }
             let rows =  $("#bootstrap-table").bootstrapTable('getSelections');
-            console.log(rows);
+            //console.log(rows);
             var ids = "";
             for (var i = 0; i<rows.length; i++){
                 ids += rows[i].id;
@@ -202,8 +204,8 @@
                 url:prefix_header + "/conformContainerSave",
                 type:"post",
                 data:{
-                    "orgContainerCode":orgContainerCode,
-                    "destContainerCode":destContainerCode,
+                    "orgLocationCode":orgLocationCode,
+                    "destLocationCode":destLocationCode,
                     "detailIdList":ids,
                 },
                 success:function (result) {