Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -395,6 +395,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (ObjectUtil.isEmpty(sub_jo)) {
                         throw new BadRequestException("未查询到该木箱对应的包装关系！");
                     }
+
+                    // 校验木箱长度类型
+                    double box_length = sub_jo.getDoubleValue("box_length");
+
+                    if (522 <= box_length && box_length <= 614) {
+                        device_code = device_code + "_1";
+                    } else if (672 <= box_length && box_length <= 814) {
+                        device_code = device_code + "_2";
+                    } else {
+                        device_code = device_code + "_3";
+                    }
+
                     String sale_order_name = sub_jo.getString("sale_order_name");
 
                     //查询是否存在可用的空位
@@ -580,7 +592,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     data.put("box_length", box_length);
                     data.put("box_width", box_width);
                     data.put("box_high", box_high);
-                    data.put("bundle_times", 2);
 
                     Double box_length_value = Double.valueOf(box_length);
                     if (box_length_value >= 772) {

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java

@@ -153,4 +153,11 @@ public class CheckController {
         checkService.disposeConfirm(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @PostMapping("/confirmBtn")
+    @Log("强制确认")
+    @ApiOperation("强制确认")
+    public ResponseEntity<Object> confirmBtn(@RequestBody JSONObject whereJson) {
+        checkService.confirmBtn(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java

@@ -119,4 +119,9 @@ public interface CheckService {
      * 新增全部在库木箱
      */
     void allInsert(JSONObject whereJson);
+
+    /**
+     * 强制确认
+     */
+    void confirmBtn(JSONObject whereJson);
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java

@@ -808,4 +808,15 @@ public class CheckServiceImpl implements CheckService {
             dtlTab.insert(jsonDtl);
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirmBtn(JSONObject whereJson) {
+        WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_CheckMst");
+
+        JSONObject jsonMst = mstTab.query("check_id = '" + whereJson.getString("check_id") + "'").uniqueResult(0);
+        jsonMst.put("status", "99");
+
+        mstTab.update(jsonMst);
+    }
 }

lms/nladmin-ui/src/views/wms/st/inStor/check/check.js

@@ -115,4 +115,11 @@ export function allInsert(data) {
     data
   })
 }
-export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm, allInsert }
+export function confirmBtn(data) {
+  return request({
+    url: '/api/check/confirmBtn',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm, allInsert, confirmBtn }

lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue

@@ -130,17 +130,17 @@
         >
           异常处理
         </el-button>
-   <!--     <el-button
+        <el-button
           slot="right"
           class="filter-item"
           type="success"
           icon="el-icon-check"
-          :disabled="downdtl_flag"
+          :disabled="check_flag"
           size="mini"
-          @click="downdtl"
+          @click="confirmBtn"
         >
-          导出Excel
-        </el-button>-->
+          强制确认
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -347,6 +347,12 @@ export default {
       const _selectData = this.$refs.table.selection
       this.openParam = _selectData[0].check_code
       this.processDialogShow = true
+    },
+    confirmBtn() {
+      const _selectData = this.$refs.table.selection
+      check.confirmBtn(_selectData[0]).then(res => (
+        this.crud.toQuery()
+      ))
     }
   }
 }