修改bug

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java

@@ -145,6 +145,8 @@ public class DailyplanServiceImpl implements DailyplanService {
         json.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId());
         String workorder_code = CodeUtil.getNewCode("R_CODE");
         json.put("plan_code", workorder_code);
+        json.put("workorder_type", "02");
+        json.put("plan_id", "");
         json.put("weight_unit_id", "1");
         json.put("weight_unit_name", "千克\\公斤");
         json.put("status", "01");
@@ -271,6 +273,7 @@ public class DailyplanServiceImpl implements DailyplanService {
             new_jo.put("qty_unit_name",jo.getString("weight_unit_name"));
             new_jo.put("workorder_qty",jo.getString("standard_weight"));
             new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00");
+            new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59");
             new_jo.put("status","10");
             new_jo.put("source_bill_id",jo.getString("dailyplan_id"));
             new_jo.put("source_bill_type",jo.getString("workorder_type"));
@@ -372,7 +375,7 @@ public class DailyplanServiceImpl implements DailyplanService {
                         throw new BadRequestException("产品工艺路线未设置不允许预排！");
                     }
                     int total_plan_time = ProcessRoute.getInteger("total_plan_time");
-                    BigDecimal days = NumberUtil.round(total_plan_time/24,0);
+                    int days = (int) Math.ceil(total_plan_time/24.0);
 
                     if(pcsn_num_day > 0){
                         if(pcsn_num > pcsn_num_day){
@@ -382,7 +385,7 @@ public class DailyplanServiceImpl implements DailyplanService {
                             jo.put("product_series_id",jo.getString("product_series"));
                             jo.put("planstart_date",DateUtil.formatDate(date));
 
-                            Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                            Date planend_date = DateUtil.offsetDay(date,days-1);
                             jo.put("planend_date",DateUtil.formatDate(planend_date));
                             this.createDay(jo);
 
@@ -397,7 +400,7 @@ public class DailyplanServiceImpl implements DailyplanService {
                             jo.put("product_series_id",jo.getString("product_series"));
                             jo.put("planstart_date",DateUtil.formatDate(date));
 
-                            Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                            Date planend_date = DateUtil.offsetDay(date,days-1);
                             jo.put("planend_date",DateUtil.formatDate(planend_date));
                             this.createDay(jo);
 
@@ -420,7 +423,7 @@ public class DailyplanServiceImpl implements DailyplanService {
                         jo.put("product_series_id",jo.getString("product_series"));
                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                        Date planend_date = DateUtil.offsetDay(date,days-1);
                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                         this.createDay(jo);
 
@@ -435,7 +438,7 @@ public class DailyplanServiceImpl implements DailyplanService {
                         jo.put("product_series_id",jo.getString("product_series"));
                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                        Date planend_date = DateUtil.offsetDay(date,days-1);
                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                         this.createDay(jo);
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java

@@ -464,7 +464,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                 throw new BadRequestException("产品工艺路线未设置不允许预排！");
                             }
                             int total_plan_time = ProcessRoute.getInteger("total_plan_time");
-                            BigDecimal days = NumberUtil.round(total_plan_time/24,0);
+                            int days = (int) Math.ceil(total_plan_time/24.0);
                             if(pcsn_num_day > 0){
                                 if(pcsn_num > pcsn_num_day){
                                     jo.put("workorder_type","01");
@@ -473,7 +473,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -488,7 +488,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -510,7 +510,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                 jo.put("product_series_id",jo.getString("product_series"));
                                 jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                Date planend_date = DateUtil.offsetDay(date,days-1);
                                 jo.put("planend_date",DateUtil.formatDate(planend_date));
                                 this.createDay(jo);
 
@@ -525,7 +525,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                 jo.put("product_series_id",jo.getString("product_series"));
                                 jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                Date planend_date = DateUtil.offsetDay(date,days-1);
                                 jo.put("planend_date",DateUtil.formatDate(planend_date));
                                 this.createDay(jo);
 
@@ -576,7 +576,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     throw new BadRequestException("产品工艺路线未设置不允许预排！");
                                 }
                                 int total_plan_time = ProcessRoute.getInteger("total_plan_time");
-                                BigDecimal days = NumberUtil.round(total_plan_time/24,0);
+                                int days = (int) Math.ceil(total_plan_time/24.0);
 
                                 if(pcsn_num_day > 0){
                                     if(pcsn_num > pcsn_num_day){
@@ -586,7 +586,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                         jo.put("product_series_id",jo.getString("product_series"));
                                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                        Date planend_date = DateUtil.offsetDay(date,days-1);
                                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                                         this.createDay(jo);
 
@@ -601,7 +601,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                         jo.put("product_series_id",jo.getString("product_series"));
                                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                        Date planend_date = DateUtil.offsetDay(date,days-1);
                                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                                         this.createDay(jo);
 
@@ -624,7 +624,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -639,7 +639,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -686,7 +686,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     throw new BadRequestException("产品工艺路线未设置不允许预排！");
                                 }
                                 int total_plan_time = ProcessRoute.getInteger("total_plan_time");
-                                BigDecimal days = NumberUtil.round(total_plan_time/24,0);
+                                int days = (int) Math.ceil(total_plan_time/24.0);
 
                                 if(pcsn_num_day > 0){
                                     if(pcsn_num > pcsn_num_day){
@@ -696,7 +696,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                         jo.put("product_series_id",jo.getString("product_series"));
                                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                        Date planend_date = DateUtil.offsetDay(date,days-1);
                                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                                         this.createDay(jo);
 
@@ -711,7 +711,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                         jo.put("product_series_id",jo.getString("product_series"));
                                         jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                        Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                        Date planend_date = DateUtil.offsetDay(date,days-1);
                                         jo.put("planend_date",DateUtil.formatDate(planend_date));
                                         this.createDay(jo);
 
@@ -733,7 +733,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -748,7 +748,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                     jo.put("product_series_id",jo.getString("product_series"));
                                     jo.put("planstart_date",DateUtil.formatDate(date));
 
-                                    Date planend_date = DateUtil.offsetDay(date,days.intValue()-1);
+                                    Date planend_date = DateUtil.offsetDay(date,days-1);
                                     jo.put("planend_date",DateUtil.formatDate(planend_date));
                                     this.createDay(jo);
 
@@ -783,8 +783,16 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
     @Override
     public JSONArray getDevices(Map json) {
         HashMap<String, String> map = new HashMap<>(json);
+        String product_series_id = map.get("product_series_id");
+        JSONArray ret = new JSONArray();
+        if (StrUtil.isEmpty(product_series_id)) {
             map.put("flag", "3");
-        JSONArray ret = WQL.getWO("QPDM_PRODUCTPLANPROC").addParamMap(map).process().getResultJSONArray(0);
+           ret = WQL.getWO("QPDM_PRODUCTPLANPROC").addParamMap(map).process().getResultJSONArray(0);
+        }else{
+            map.put("flag", "33");
+            map.put("product_series", product_series_id);
+            ret = WQL.getWO("QPDM_PRODUCTPLANPROC").addParamMap(map).process().getResultJSONArray(0);
+        }
         return ret;
     }
 
@@ -811,6 +819,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
         json.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId());
         String workorder_code = CodeUtil.getNewCode("R_CODE");
         json.put("plan_code", workorder_code);
+        json.put("workorder_type", "01");
         json.put("weight_unit_id", "1");
         json.put("weight_unit_name", "千克\\公斤");
         json.put("status", "01");

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java

@@ -177,16 +177,30 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
-
+        WQLObject MPS_BD_ProductDailyPlan = WQLObject.getWQLObject("MPS_BD_ProductDailyPlan");
-        WQLObject wo = WQLObject.getWQLObject("PDM_BI_WorkOrder");
+        WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder");
         for (Long workorder_id : ids) {
+            JSONObject jo =  PDM_BI_WorkOrder.query("is_delete='0' and workorder_id='"+workorder_id+"'").uniqueResult(0);
+            if(jo==null){
+                throw new BadRequestException("该记录不存在！");
+            }
             JSONObject param = new JSONObject();
             param.put("workorder_id", String.valueOf(workorder_id));
             param.put("is_delete", "1");
             param.put("update_optid", currentUserId);
             param.put("update_optname", nickName);
             param.put("update_time", now);
-            wo.update(param);
+            PDM_BI_WorkOrder.update(param);
+            String source_bill_id = jo.getString("source_bill_id");
+
+            JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0);
+            if(ja.size() == 0){
+                if (StrUtil.isNotEmpty(source_bill_id)) {
+                    JSONObject param2 = new JSONObject();
+                    param2.put("status", "01");
+                    MPS_BD_ProductDailyPlan.update(param2,"dailyplan_id='"+source_bill_id+"'");
+                }
+            }
         }
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql

@@ -149,6 +149,29 @@
         ENDQUERY
     ENDIF
 
+     IF 输入.flag = "33"
+        QUERY
+            SELECT
+                deviceinfo.device_id AS id,
+                deviceinfo.device_code AS CODE,
+                deviceinfo.device_name AS NAME
+            FROM MPS_BD_CapacityTemplateWorkDevice WorkDevice
+              LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkDevice.device_id
+            WHERE
+             1 = 1
+                AND WorkDevice.captemplate_id = '1534741977764073472'
+                 AND WorkDevice.workprocedure_id = '1472449923327856640'
+                AND deviceinfo.is_active = '1'
+                AND deviceinfo.is_delete = '0'
+                AND deviceinfo.is_produceuse = '1'
+                AND deviceinfo.workprocedure_code = 'GX003'
+                 OPTION 输入.product_series <> ""
+                       WorkDevice.product_series_id = 输入.product_series
+                ENDOPTION
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
     IF 输入.flag = "4"
             QUERY
                 SELECT

mes/qd/src/api/wms/pdm/producetask.js

@@ -47,10 +47,11 @@ export function submit2(data) {
   })
 }
 
-export function getDevices() {
+export function getDevices(params) {
   return request({
     url: 'api/producetask/getDevices',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 

mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue

@@ -39,12 +39,13 @@
           <el-button slot="append" icon="el-icon-search" @click="queryMater" />
         </el-input>
       </el-form-item>
-      <el-form-item label="系列" prop="product_series_id">
+      <el-form-item label="产线系列" prop="product_series_id">
         <el-select
           v-model="form.product_series_id"
           placeholder=""
           style="width: 210px"
           class="filter-item"
+          @change="storChange"
         >
           <el-option
             v-for="item in XLList"
@@ -101,7 +102,6 @@
         <el-input v-model="form.remark" style="width: 480px;" rows="3" type="textarea" :disabled="crud.status.view > 0" />
       </el-form-item>
     </el-form>
-    <DeviceDialog :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
     <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
     <span slot="footer" class="dialog-footer">
       <el-button slot="left" type="info" @click="crud.cancelCU">关闭</el-button>
@@ -112,7 +112,6 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import DeviceDialog from '@/views/wms/pub/DeviceDialog'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
 import workorder from '@/api/wms/pdm/workorder'
 import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
@@ -123,7 +122,6 @@ const defaultForm = {
   plan_code: '',
   material_code: '',
   material_id: '',
-  device_name: '',
   device_id: '',
   plan_org_code: '',
   plan_org_name: '',
@@ -137,7 +135,7 @@ const defaultForm = {
 }
 export default {
   name: 'AddDialog',
-  components: { DeviceDialog, MaterDialog },
+  components: { MaterDialog },
   mixins: [crud(), form(defaultForm)],
   props: {
     dialogShow: {
@@ -175,7 +173,7 @@ export default {
           { required: true, message: '产品不能为空', trigger: 'blur' }
         ],
         product_series_id: [
-          { required: true, message: '系列不能为空', trigger: 'blur' }
+          { required: true, message: '产线系列不能为空', trigger: 'blur' }
         ],
         product_weight: [
           { required: true, message: '重量不能为空', trigger: 'blur' }
@@ -208,17 +206,30 @@ export default {
     async queryMater(index, row) {
       this.materShow = true
     },
+    storChange(row) {
+      this.form.device_id = ''
+      producetask.getDevices({ product_series_id: row }).then(res => {
+        this.Devices = res
+        if (this.Devices.length > 0) {
+          this.form.device_id = this.Devices[0].id
+        }
+      })
+    },
     tableChanged2(row) {
       this.form.material_id = row.material_id
       this.form.material_code = row.material_code
       this.form.product_series_id = row.product_series
       this.form.weight_unit_id = row.base_unit_id
       this.form.weight_unit_name = row.base_unit_id_name
-      this.form.pcsn = ''
+      this.form.product_weight = row.standard_weight_pft
-    },
+      producetask.getDevices({ product_series_id: row.product_series }).then(res => {
-    tableChanged(row) {
+        this.Devices = res
-      this.form.device_id = row.device_id
+        if (this.Devices.length > 0) {
-      this.form.device_name = row.device_name
+          this.form.device_id = this.Devices[0].id
+        } else {
+          this.form.device_id = ''
+        }
+      })
     },
     [CRUD.HOOK.beforeSubmit]() {
     }