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

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java

@@ -293,7 +293,7 @@ public class RawFoilServiceImpl implements RawFoilService {
 
         JSONObject raw_jo = whereJson.getJSONObject("raw_jo");
 
-        JSONObject jsonCool = coolTab.query("mfg_order_name = '" + raw_jo.getString("mfg_order_name") + "'").uniqueResult(0);
+        JSONObject jsonCool = coolTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0);
 
         jsonCool.put("status", "09");
         jsonCool.put("realend_time", DateUtil.now());

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java

@@ -3,6 +3,8 @@ package org.nl.wms.sch.tasks;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -85,6 +87,16 @@ public class OutTask extends AbstractAcsTask {
             Long currentUserId = SecurityUtils.getCurrentUserId();
             String currentUsername = SecurityUtils.getCurrentUsername();
 
+            // 判断此任务是否有任务组
+            String task_group_id = jsonTask.getString("task_group_id");
+            if (ObjectUtil.isNotEmpty(task_group_id)) {
+                // 上一个任务组顺序号
+                String sort_seq_last = NumberUtil.sub(jsonTask.getString("sort_seq"), "1").toString();
+
+                JSONObject jsonTaskLast = taskTab.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0);
+                if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务！");
+            }
+
             // 更改任务状态为完成
 //            jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
             jsonTask.put("update_optid", currentUserId);

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -200,13 +200,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String user = map.getString("user");
-        if (user.equals("mes")) {
+        if (ObjectUtil.isNotEmpty(user)) {
-            currentUserId = Long.parseLong(2 + "");
+            if (user.equals("mes")) {
-            nickName = "mes用户";
+                currentUserId = Long.parseLong(2 + "");
-        }
+                nickName = "mes用户";
-        if (user.equals("sap")) {
+            }
-            currentUserId = Long.parseLong(3 + "");
+            if (user.equals("sap")) {
-            nickName = "sap用户";
+                currentUserId = Long.parseLong(3 + "");
+                nickName = "sap用户";
+            }
         }
         String now = DateUtil.now();
         String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
@@ -231,12 +233,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         map.put("update_time", now);
         map.put("is_delete", "0");
         map.put("is_upload", "0");
-        if (!user.equals("mes") || user.equals("sap")) {
+        if (ObjectUtil.isNotEmpty(user)) {
-            Long deptId = SecurityUtils.getDeptId();
+            if (!user.equals("mes") || user.equals("sap")) {
-            map.put("sysdeptid", deptId);
+                Long deptId = SecurityUtils.getDeptId();
-            map.put("syscompanyid", deptId);
+                map.put("sysdeptid", deptId);
+                map.put("syscompanyid", deptId);
+            }
         }
-
         double qty = 0.0; // 主表重量
         int num = rows.size(); // 明细数
         for (int i = 0; i < rows.size(); i++) {

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

@@ -232,7 +232,6 @@ import DivDialog from '@/views/wms/st/outbill/DivDialog'
 import TaskDialog from '@/views/wms/st/outbill/TaskDialog'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
-import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 
 export default {
@@ -284,9 +283,9 @@ export default {
     crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
       this.storlist = res.content
     })
-    crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
+    // crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
-      this.billtypelist = res
+    //   this.billtypelist = res
-    })
+    // })
   },
   methods: {
     canUd(row) {
@@ -384,7 +383,6 @@ export default {
     },
     print(jo) {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': jo.iostorinv_id }).then(res => {
-        debugger
         var total_array = []
         for (var i = 0; i < res.length; i++) {
           var jre = res[i]
@@ -440,6 +438,7 @@ export default {
       LODOP.SET_PRINT_STYLEA(0, 'LinkedItem', -6)
       LODOP.ADD_PRINT_HTM('20%', '5%', '100%', '100%', '客户（签字盖章）:______________')
       LODOP.SET_PRINT_STYLEA(0, 'LinkedItem', -7)
+
       // 另起一页
       LODOP.SET_PRINT_STYLE('FontSize', 17)
       LODOP.SET_PRINT_STYLE('Bold', 1)
@@ -453,7 +452,9 @@ export default {
       LODOP.SET_PRINT_STYLEA(0, 'ItemType', 1)
       LODOP.SET_PRINT_STYLEA(0, 'LinkedItem', 1)
 
-      // 后台数据
+      // 画线
+      // LODOP.ADD_PRINT_LINE('0%', '10%', '10%', '100%', 0, 1)
+
       LODOP.ADD_PRINT_HTM('3%', '5%', '100%', '100%', '实际发货日期:' + jo.biz_date)
       LODOP.SET_PRINT_STYLEA(0, 'ItemType', 1)
       LODOP.SET_PRINT_STYLEA(0, 'LinkedItem', 1)