rev:刻字包装调度代码/半成品入库数量改重量

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java

@@ -59,7 +59,7 @@ public enum AcsTaskEnum {
     REQUEST_WARP_CALL_FULL("5","包装缺料请求"),//ok
     REQUEST_WARP_SEND_EMP("6","包装送空框请求"),//ok
     REQUEST_WASH_LACK("7","清洗机器缺料请求"),//深坑->清洗:相同物料的重量<150公斤；
-    REQUEST_WASH_FULL("8","清洗机器满料请求"),//清洗机满料请求//去半成品入库
+    REQUEST_WASH_FULL("9","清洗机器满料请求"),//清洗机满料请求//去半成品入库
     REQUEST_WASH_EMP("10","清洗机器空框请求"),//清洗机下料位
     REQUEST_WASH_FULL_ERROR("11","清洗机-满料异常请求"),//去半成品入库 异常位
     REQUEST_WASH_PLOTTER_EMP("12","刻字上料空框回库"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java

@@ -41,7 +41,7 @@ public class AcsToWmsController {
     @Log("ACS给WMS发送任务")
     //("ACS给WMS发送任务")
     @SaIgnore
-    public ResponseEntity<Object> receiveTaskFromAcs(@RequestBody JSONObject whereJson) {
+    public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
     }
 
@@ -61,7 +61,7 @@ public class AcsToWmsController {
     @Log("ACS给WMS反馈任务状态")
     //("ACS给WMS反馈任务状态")
     @SaIgnore
-    public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
+    public ResponseEntity<Object> status(@RequestBody String string) {
         return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK);
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java

@@ -132,36 +132,28 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
             String processing_class = one.getHandle_class();
             String status = row.getString("status");
             // 任务处理类
-            try {
+            if (!status.equals(StatusEnum.TASK_FINISH.getCode())){
-                if (ObjectUtil.isNotEmpty(processing_class)) {
+                try {
-                    AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
+                    if (ObjectUtil.isNotEmpty(processing_class)) {
-                    if (taskHandler!=null){
+                        AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
-                        taskHandler.updateTaskStatus(row,status);
+                        if (taskHandler!=null){
+                            taskHandler.updateTaskStatus(row,status);
+                        }
                     }
-                }else {
+                    //发布一个任务执行事件:服务跟任务不一样，可以同事存在
-//                    EXECUTING("6", "执行中"),
+                    TaskEvent event = TaskEvent.builder()
-//                                FINISHED("7", "完成"),
+                            .task_id(task_id)
-//                                CANCEL("8", "取消");
+                            .task_type(one.getTask_type())
-//                        //回调状态
+                            .status(status)
-//                        STATUS_START("1","执行中"),
+                            .build();
-//                                STATUS_FINISH("2","完成"),
+                    BussEventMulticaster.Publish(event);
-//                                STATUS_CANNEL("3","取消"),
+                } catch (Exception e) {
-                    itaskService.update(new UpdateWrapper<SchBaseTask>().set("task_status",String.valueOf(Integer.valueOf(status)+5)));
+                    log.error("任务状态更新失败:{}", e.getMessage());
-
+                    JSONObject json = new JSONObject();
+                    json.put("task_id", task_id);
+                    json.put("message", e.getMessage());
+                    errArr.add(json);
                 }
-                //发布一个任务执行事件:服务跟任务不一样，可以同事存在
-                TaskEvent event = TaskEvent.builder()
-                        .task_id(task_id)
-                        .task_type(one.getTask_type())
-                        .status(status)
-                        .build();
-                BussEventMulticaster.Publish(event);
-            } catch (Exception e) {
-                log.error("任务状态更新失败:{}", e.getMessage());
-                JSONObject json = new JSONObject();
-                json.put("task_id", task_id);
-                json.put("message", e.getMessage());
-                errArr.add(json);
             }
         }
         JSONObject result = new JSONObject();

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java

@@ -28,7 +28,7 @@ public class PointListener extends AbstraceListener<PointEvent> {
             task.put("task_id", task_id);
             task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
             task.put("task_type", event.getType().getCode());
-            task.put("task_type", event.getType().getDesc());
+            task.put("task_name", event.getType().getDesc());
             task.put("acs_task_type", event.getAcs_task_type());
             task.put("task_status", TaskStatusEnum.CREATED.getCode());
             task.put("point_code1", event.getPoint_code1());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java

@@ -68,7 +68,7 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
             pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
                     .set("lock_type",StatusEnum.LOCK_ON.getCode())
                     .set("task_id",one.getTask_id())
-                    .eq("point_code",one.getPoint_code1()).ne("task_id",one.getTask_id()));
+                    .eq("point_code",one.getPoint_code1()));
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
             // 完成

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java

@@ -64,7 +64,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
             pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
                     .set("lock_type",StatusEnum.LOCK_ON.getCode())
                     .set("task_id",one.getTask_id())
-                    .eq("point_code",one.getPoint_code3()).ne("task_id",one.getTask_id()));
+                    .eq("point_code",one.getPoint_code3()));
 
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java

@@ -95,7 +95,7 @@ public class WashCallEmptyTask extends AbstractAcsTask {
                             .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
                             .set(StIvtStructattr::getIs_emptyvehicle,false)
                             .set(StIvtStructattr::getStoragevehicle_code,"")
-                            .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1())
+                            .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code3())
             );
         }
         taskService.updateById(taskDao);

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java

@@ -112,7 +112,7 @@ public class WashSendMaterialQZTask extends AbstractAcsTask {
         PdmProduceWorkorder order = null;
         if (StringUtils.isNotEmpty(param.getString("workorder_code"))){
             order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
-                    .eq("workorder_code", "123456")// param.getString("workorder_code"))
+                    .eq("workorder_code", param.getString("workorder_code"))// )
                     .eq("is_delete", false)
                     .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
         }

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java

@@ -18,6 +18,7 @@ import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.storage_manage.IOSEnum;
 import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
 import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
@@ -60,7 +61,6 @@ public class WashSendMaterialTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject param, String status) {
-        stIvtIostorinvBcpService.taskOperate(param);
     }
 
     @Override
@@ -71,7 +71,7 @@ public class WashSendMaterialTask extends AbstractAcsTask {
         }else {
             String start_point_code = param.getString("device_code");
             PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
-                    .eq("workorder_code", "123456")// param.getString("workorder_code"))
+                    .eq("workorder_code", param.getString("workorder_code"))
                     .eq("is_delete", false)
                     .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
             Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
@@ -89,14 +89,16 @@ public class WashSendMaterialTask extends AbstractAcsTask {
             JSONObject form = new JSONObject();
             form.put("bill_type","0001");
             form.put("point_code",start_point_code);
-            form.put("stor_id","15286279952695336962");//半成品仓库
+            form.put("stor_id", IOSEnum.STOR_CODE.code("半成品仓库"));//半成品仓库
-            form.put("plan_qty",order.getPlan_qty());
+            form.put("total_qty",param.getString("weight"));
             form.put("material_id",order.getMaterial_id());
             form.put("unit_weight",order.getMaterial_weight());
             form.put("storagevehicle_code",param.getString("vehicle_code"));
             form.put("product_code","A1");
             form.put("auto_send",true);
-            pdaStBcpInService.createIn(form);
+            JSONObject req = new JSONObject();
+            req.put("from",form);
+            pdaStBcpInService.createIn(req);
             return "";
         }
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java

@@ -19,11 +19,15 @@ import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQu
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -70,16 +74,18 @@ public class StIvtIostorinvBcpController {
                     .set("is_delete","1")
                     .in("iostorinv_id",ids));
 
-            StIvtIostorinvBcp mst = stIvtIostorinvBcpService.getById(ids);
+            List<StIvtIostorinvBcp> bcps = stIvtIostorinvBcpService.listByIds(Arrays.asList(ids));
-
+            List<String> collect = bcps.stream().map(StIvtIostorinvBcp::getStoragevehicle_code).collect(Collectors.toList());
             // 更新载具扩展属性 - 释放载具对应物料关系 清空数量
-            iMdPbStoragevehicleextService.update(
+            if (!CollectionUtils.isEmpty(collect)){
-                    new MdPbStoragevehicleext()
+                iMdPbStoragevehicleextService.update(
-                            .setMaterial_id("")
+                        new MdPbStoragevehicleext()
-                            .setStorage_qty(BigDecimal.valueOf(0)),
+                                .setMaterial_id("")
-                    new QueryWrapper<MdPbStoragevehicleext>().lambda()
+                                .setStorage_qty(BigDecimal.valueOf(0)),
-                            .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code())
+                        new QueryWrapper<MdPbStoragevehicleext>().lambda()
-            );
+                                .in(MdPbStoragevehicleext::getStoragevehicle_code,collect)
+                );
+            }
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml

@@ -9,7 +9,7 @@
         mater.material_spec,
         task.task_code,
         task.task_status,
-        ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS weight_qty
+        ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS qty
         FROM
         st_ivt_iostorinv_bcp dtl
         LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java

@@ -137,7 +137,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
                 mst.setStor_code(stor.getStor_code());
                 mst.setStor_name(stor.getStor_name());
             }
-            packageRow(mst, (JSONObject) item);
+            packageRow(mst, JSONObject.parseObject(JSON.toJSONString(item)));
             mst.setCreate_id(SecurityUtils.getCurrentUserId());
             mst.setCreate_name(SecurityUtils.getCurrentNickName());
             mst.setCreate_time(DateUtil.now());
@@ -455,7 +455,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
         mst.setUpdate_name(SecurityUtils.getCurrentNickName());
         mst.setUpdate_time(DateUtil.now());
         for (Object item : form.getJSONArray("tableData")) {
-            packageRow(mst, (JSONObject) item);
+            packageRow(mst, JSONObject.parseObject(JSON.toJSONString(item)));
         }
         this.updateById(mst);
         return mst.getIostorinv_id();

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java

@@ -135,7 +135,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
             iMdPbStoragevehicleextService.update(
                     new UpdateWrapper<MdPbStoragevehicleext>().lambda()
                         .set(MdPbStoragevehicleext::getMaterial_id, mst.getMaterial_id())
-                        .set(MdPbStoragevehicleext::getStorage_qty, mst.getPlan_qty())
+                        .set(MdPbStoragevehicleext::getWeight, mst.getPlan_qty())
                         .eq(MdPbStoragevehicleext::getStoragevehicle_code, mst.getStoragevehicle_code())
             );
 
@@ -173,7 +173,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
                             .eq(MdPbStoragevehicleext::getStoragevehicle_code, row.getString("storagevehicle_code"))
             );
             if (ObjectUtil.isNotEmpty(vehicleExtDao)) {
-                vehicleExtDao.setStorage_qty(mst.getPlan_qty());
+                vehicleExtDao.setWeight(mst.getPlan_qty());
                 vehicleExtDao.setMaterial_id(mst.getMaterial_id());
                 iMdPbStoragevehicleextService.updateById(vehicleExtDao);
             }
@@ -313,7 +313,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
         mst.setUpdate_name(SecurityUtils.getCurrentNickName());
         mst.setUpdate_time(DateUtil.now());
         for (Object item : form.getJSONArray("tableData")) {
-            packageRow(mst, (JSONObject) item);
+            packageRow(mst, JSONObject.parseObject(JSON.toJSONString(item)));
         }
         this.updateById(mst);
         return mst.getIostorinv_id();

mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue

@@ -174,6 +174,17 @@
                 <el-radio v-model="form.is_tempstruct" label="0">否</el-radio>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item v-if="form.sect_id == '1528631044482404352'" label="是否空载具" prop="is_emptyvehicle">
+                  <el-radio
+                    v-for="item in trueorfalse"
+                    :key="item.value"
+                    v-model="form.is_emptyvehicle"
+                    :label="item.value"
+                  >{{ item.label }}
+                  </el-radio>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
@@ -207,6 +218,15 @@
         <el-table-column prop="sect_name" label="所属库区" width="150" />
         <el-table-column prop="stor_name" label="所属仓库" width="150" />
         <el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="is_emptyvehicle" label="是否空载具" width="150" >
+          <template slot-scope="scope">
+            <el-switch
+              :value="format_is_used(scope.row.is_emptyvehicle)"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+            />
+          </template>
+        </el-table-column>
         <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}
@@ -334,6 +354,7 @@ export default {
     }
     return {
       sects: [],
+      trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
       invtypelist: [],
       permission: {},
       rules: {

mes/qd/src/views/wms/old_manage/old_package/index.vue

@@ -9,7 +9,7 @@
           label-width="120px"
           label-suffix=":"
         >
-          <!--每箱袋数、每袋数量、箱数、箱型、目标巷道、是否翻转、托盘满托数量、袋数-->
+          <!--每箱袋数、每箱袋数、箱数、箱型、目标巷道、是否翻转、托盘满托数量、袋数-->
           <el-row>
             <el-col :span="6">
               <el-form-item label="每箱袋数">
@@ -22,7 +22,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="每袋数量">
+              <el-form-item label="每箱袋数">
                 <el-input-number
                   v-model="query.one_package_qty"
                   clearable

mes/qd/src/views/wms/product_manage/workorder/AddDialog.vue

@@ -77,9 +77,9 @@
         </template>
       </el-table-column>
       <el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
-      <el-table-column prop="material_code" label="物料编码" align="center" width="190px">
+      <el-table-column prop="materialCode" label="物料编码" align="center" width="190px">
         <template scope="scope">
-          <el-input v-model="scope.row.material_code" disabled class="input-with-select">
+          <el-input v-model="scope.row.materialCode" disabled class="input-with-select">
             <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
           </el-input>
         </template>
@@ -230,7 +230,7 @@ export default {
         is_used_fxx: false,
         report_qty: '',
         material_id: '',
-        material_code: '',
+        materialCode: '',
         material_weight: '',
         planproducestart_date: date,
         planproduceend_date: formatter1,
@@ -252,6 +252,7 @@ export default {
       crudWorkProcedure.downSelect({}).then(res => {
         this.workprocedureList = res
       })
+      console(this.form)
     },
     copyAdd() {
       if (!this.current_row) {
@@ -290,7 +291,7 @@ export default {
     },
     setMaterValue(row) {
       this.nowrow.material_id = row.material_id
-      this.nowrow.material_code = row.material_code
+      this.nowrow.materialCode = row.material_code
       this.nowrow.material_name = row.material_name
       this.nowrow.material_spec = row.material_spec
       this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新

mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue

@@ -20,11 +20,11 @@
         </el-form-item>
         <el-form-item label="物料编码">
           <el-input
-            v-model="form.material_code"
+            v-model="form.materialCode"
             style="width: 200px;"
             clearable
             @focus="materialShow=true"
-            @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
+            @clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
           />
         </el-form-item>
         <el-form-item label="物料名称">
@@ -148,16 +148,32 @@
           >{{ item.label }}
           </el-radio>
         </el-form-item>
-        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
+          <el-select
+            v-model="form.package_ext.auto_confirm" style="width: 200px"  >
+            <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
+          <el-input-number
+            v-model="form.package_ext.time"
+            style="width: 200px;"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
           <el-input v-model="form.package_ext.package_model" style="width: 200px;" />
         </el-form-item>
-        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
           <el-input v-model="form.package_ext.demol_num" style="width: 200px;" />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
           <el-input v-model="form.package_ext.order_bag_num" style="width: 200px;" />
         </el-form-item>
-        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
+          <el-input v-model="form.package_ext.one_bag_weight" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
           <el-input v-model="form.package_ext.stack_model" style="width: 200px;" />
         </el-form-item>
 
@@ -239,6 +255,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
+      auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
       trueorfalse:[{value: true, label: '是' }, {value: false, label: '否'}],
       reportStatus:[{value: '1', label: '创建记录' }, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
       form: {
@@ -297,10 +314,18 @@ export default {
       crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
         this.tableData = res.content
       })
-      if (this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
+      if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
         this.form.package_ext = JSON.parse(this.form.package_ext)
       }
     },
+    close() {
+      this.$emit('AddChanged')
+      if (JSON.stringify(this.form.package_ext).length>3){
+        this.form.package_ext = JSON.stringify(this.form.package_ext)
+      }else {
+        this.form.package_ext = ''
+      }
+    },
     formatBoolean: function(row, column) {
       alert(row)
       var ret = ''
@@ -325,9 +350,6 @@ export default {
         this.workprocedureList = res
       })
     },
-    close() {
-      this.$emit('AddChanged')
-    },
     setForm(row) {
       this.dialogVisible = true
       this.form = row

mes/qd/src/views/wms/product_manage/workorder/index.vue

@@ -290,13 +290,13 @@
           <el-form-item v-if="false" label="物料标识" prop="material_id">
             <el-input v-model="form.material_id" style="width: 200px;" />
           </el-form-item>
-          <el-form-item label="物料编码" prop="material_code">
+          <el-form-item label="物料编码" prop="materialCode">
             <el-input
-              v-model="form.material_code"
+              v-model="form.materialCode"
               style="width: 200px;"
               clearable
               @focus="materialShow=true"
-              @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
+              @clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
             />
           </el-form-item>
           <el-form-item label="物料名称" prop="material_name">
@@ -370,7 +370,7 @@
               <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
             <el-radio
               v-for="item in dict.IS_OR_NOT"
               :key="item.id"
@@ -379,19 +379,19 @@
             >{{ item.label }}
             </el-radio>
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
             <el-select
               v-model="form.package_ext.unboxing_device_code" style="width: 200px"  >
               <el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
             <el-select
               v-model="form.package_ext.ealing_device_code" style="width: 200px"  >
               <el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
             <el-radio
               v-for="item in dict.IS_OR_NOT"
               :key="item.id"
@@ -400,28 +400,48 @@
             >{{ item.label }}
             </el-radio>
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
+            <el-select
+              v-model="form.package_ext.auto_confirm" style="width: 200px"  >
+              <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
+            <el-input-number
+              v-model="form.package_ext.time"
+              style="width: 200px;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
             <el-input-number
               v-model="form.package_ext.package_model"
               style="width: 200px;"
               clearable
                 />
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
             <el-input-number
               v-model="form.package_ext.demol_num"
               style="width: 200px;"
               clearable
               />
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
             <el-input-number
               v-model="form.package_ext.order_bag_num"
               style="width: 200px;"
               clearable
               />
           </el-form-item>
-          <el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
+            <el-input-number
+              v-model="form.package_ext.one_bag_weight"
+              style="width: 200px;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
             <el-input-number
               v-model="form.package_ext.stack_model"
               style="width: 200px;"
@@ -462,7 +482,7 @@
         <el-table-column prop="outupperlimit_qty" label="满筐数量" />
         <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
         <el-table-column prop="real_qty" label="报工总数" />
-        <el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('materialCode',crud.data,'物料编码')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
         <el-table-column
@@ -578,7 +598,7 @@ const defaultForm = {
   person_real_qty: null,
   dq_real_qty: null,
   material_id: null,
-  material_code: null,
+  materialCode: null,
   material_weight: null,
   material_name: null,
   material_spec: null,
@@ -643,6 +663,7 @@ export default {
   data() {
     return {
       zxj: [ { value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
+      auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
       cxj: [ { value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
       trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
       deviceList: [],
@@ -672,7 +693,7 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        material_code: [
+        materialCode: [
           { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
         order_status: [
@@ -820,7 +841,6 @@ export default {
     },
     // 查看
     toView(row) {
-      console.log(row)
       if (row !== null) {
         this.$refs.child3.setForm(row)
       }
@@ -907,7 +927,7 @@ export default {
     // 新增编辑给form表单物料相关信息赋值
     setMaterValue(row) {
       this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
+      this.form.materialCode = row.material_code
       this.form.material_name = row.material_name
       this.form.material_spec = row.material_spec
     },
@@ -961,7 +981,7 @@ export default {
     [CRUD.HOOK.beforeToEdit]() {
       console.log(this.form.package_ext)
       console.log(this.form)
-      if (this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
+      if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
         this.form.package_ext = JSON.parse(this.form.package_ext)
       }
 

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue

@@ -163,7 +163,7 @@
           />
         </template>
       </el-table-column>-->
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量">
         <template slot-scope="scope">
           <el-input-number
             v-model="form.tableData[scope.$index].plan_qty"
@@ -338,7 +338,7 @@ export default {
         //   return false
         // }
         if (!row.plan_qty) {
-          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+          this.crud.notify('重量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
         if (!this.form.stor_id) {

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue

@@ -82,7 +82,7 @@
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
         <el-input-number
-          v-model="form.weight_qty"
+          v-model="form.total_qty"
           :controls="false"
           :precision="3"
           :min="0"

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue

@@ -161,8 +161,8 @@
 <!--        <el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />-->
         <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="weight_qty" label="总数量" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
         <el-table-column show-overflow-tooltip min-width="120" prop="unit_weight" label="单重" />
         <el-table-column show-overflow-tooltip min-width="120" prop="storagevehicle_code" label="载具号" />
         <el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="入库点" />

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue

@@ -84,8 +84,8 @@
         <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
-        <el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="canuse_qty" label="可用重量(g)" :formatter="crud.formatNum3" />
-        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+<!--        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
         <el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />
       </el-table>
       <!--分页组件-->

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue

@@ -103,9 +103,9 @@
         <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
         <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
         <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
-        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数(g)" :formatter="crud.formatNum3" />
-        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数(g)" :formatter="crud.formatNum3" />
-        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+<!--        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
       </el-table>
       <!--分页组件-->
       <pagination />

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue

@@ -165,7 +165,7 @@
           <el-table-column type="index" label="序号" width="50" align="center" />
           <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
           <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
-          <el-table-column show-overflow-tooltip prop="canuse_qty" label="数量（个）" width="110px" />
+          <el-table-column show-overflow-tooltip prop="canuse_qty" label="重量(g)" width="110px" />
           <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
           <el-table-column show-overflow-tooltip prop="unit_weight" label="单重" width="85px" />
           <el-table-column show-overflow-tooltip prop="struct_code" label="货位" />

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue

@@ -176,7 +176,7 @@
       <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" />
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量(g)" />
       <el-table-column show-overflow-tooltip prop="unit_weight" label="单重" />
       <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
       <el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
@@ -280,7 +280,8 @@ export default {
       crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
         this.storlist = res.content
       })
-      const area_type = 'A1_BCPCK01'
+      //A1_BCPCK01
+      const area_type = 'A1_BCPRK01'
       crudPoint.getPoint({ 'area_type': area_type }).then(res => {
         this.pointList = res
       })

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue

@@ -62,7 +62,7 @@
         <el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号" />
         <el-table-column show-overflow-tooltip prop="material_spec" width="100" label="物料规格" />
         <el-table-column show-overflow-tooltip width="300" prop="material_name" label="物料名称" />
-        <el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="数量（个）" />
+        <el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="重量(g)" />
         <el-table-column show-overflow-tooltip width="100" prop="unit_weight" label="单重" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
       </el-table>

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue

@@ -75,12 +75,12 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="总重量" prop="detail_count">
+      <el-form-item label="总数量" prop="detail_count">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
-        <el-input v-model="form.weight_qty" size="mini" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="总数量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
+        <el-input v-model="form.qty" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
         <el-input-number
           v-model="form.plan_qty"
           :controls="false"
@@ -117,8 +117,8 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" width="150" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="qty_unit_name" label="单位" align="center" />
+<!--        <el-table-column prop="qty_unit_name" label="单位" align="center" />-->
         <el-table-column prop="unit_weight" label="单重" align="center" />
         <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
         <el-table-column prop="struct_code" label="起始位置" align="center" />

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue

@@ -160,9 +160,9 @@
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="weight_qty" label="总数量" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />
+<!--        <el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />-->
         <el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="出库点" />
         <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />
         <el-table-column label="备注" align="center" prop="remark" />