rev:更新单据完成时没有更新update_tiem；

rev:生成载具时高度信息没有

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java

@@ -58,6 +58,7 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl<BmVehicleInfoMapper, B
             throw new BadRequestException("此载具类型"+map.getString("vehicle_type")+"没有配置字典值");
         }
         JSONArray resultCodeArr = new JSONArray();
+        BmVehicleInfo vehicleInfo = map.toJavaObject(BmVehicleInfo.class);
         int num = MapUtil.getInt(map, "num");
         for (int i = 0; i < num; i++) {
             BmVehicleInfo entity = new BmVehicleInfo();
@@ -65,8 +66,13 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl<BmVehicleInfoMapper, B
             entity.setVehicle_name(entity.getVehicle_name());
             entity.setUpdate_name(SecurityUtils.getCurrentNickName());
             entity.setUpdate_name(DateUtil.now());
-            entity.setIs_used(map.getString("is_used").equals("1"));
+            entity.setIs_used(vehicleInfo.getIs_used());
             entity.setVehicle_type(dict.getValue());
+            entity.setH(vehicleInfo.getH());
+            entity.setL(vehicleInfo.getL());
+            entity.setW(vehicleInfo.getW());
+            entity.setOverstruct_type(vehicleInfo.getOverstruct_type());
+            entity.setOccupystruct_qty(vehicleInfo.getOccupystruct_qty());
             this.save(entity);
             resultCodeArr.add(entity.getVehicle_code());
         }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java

@@ -90,6 +90,7 @@ public class FormActivityBehavior extends FlowNodeActivityBehavior<JSONObject> {
                 JSONObject mst_json = handler.getJSONObject("t");
                 mst_json.put("id",IdUtil.getStringId());
                 mst_json.put("create_time",DateUtil.now());
+                mst_json.put("update_time",DateUtil.now());
                 mst_json.put("create_name",SecurityUtils.getCurrentNickName());
                 mst_json.put("status",StatusEnum.FORM_STATUS.code("生成"));
                 mst_json.put("bill_type",currentNode.getBill_type());

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java

@@ -14,6 +14,8 @@ import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
 import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution;
+import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
+import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
 import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService;
@@ -45,7 +47,8 @@ public class IOStorageController {
     private IActRuExecutionService iActRuExecutionService;
     @Autowired
     private IPmFormDataService iPmFormDataService;
-
+    @Autowired
+    private IMdGruopDickService iMdGruopDickService;
 
     @PostMapping("out")
     @SaIgnore
@@ -68,12 +71,14 @@ public class IOStorageController {
                 }
             }
             //单据校验"针对托盘库拣选
-            int count = iPmFormDataService.count(new QueryWrapper<PmFormData>()
-                    .eq("form_type", "Picking")
-                    .eq("vehicle_code", vehicle_code)
-                    .lt("status", StatusEnum.FORM_STATUS.code("完成")));
-            if (count>0){
-                throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code));
+            if (vehicle_code.contains("T")){
+                int count = iPmFormDataService.count(new QueryWrapper<PmFormData>()
+                        .eq("form_type", "Picking")
+                        .eq("vehicle_code", vehicle_code)
+                        .lt("status", StatusEnum.FORM_STATUS.code("完成")));
+                if (count>0){
+                    throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code));
+                }
             }
             iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>()
                     .set("is_delete",true)
@@ -81,6 +86,13 @@ public class IOStorageController {
                     .set("update_time", DateUtil.now())
                     .set("update_name", SecurityUtils.getCurrentNickName())
                     .eq("id",one.getId()));
+            if (StringUtils.isNotEmpty(one.getGroup_id())){
+                iMdGruopDickService.update(new UpdateWrapper<MdGruopDick>()
+                        .set("status", StatusEnum.FORM_STATUS.code("完成"))
+                        .set("update_time", DateUtil.now())
+                        .eq("id", one.getGroup_id())
+                );
+            }
         }
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,7 +29,16 @@ public class PdaPickController {
 
     @Autowired
     private IMdGruopDickService iMdGruopDickService;
+    @Autowired
+    private IPmFormDataService iPmFormDataService;
 
+    @PostMapping("queryPick")
+    @SaIgnore
+    @Log("查询拣选作业")
+    public ResponseEntity<Object> queryPick(@RequestBody JSONObject form) {
+        iMdGruopDickService.groupDick(form);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
 
     @PostMapping("savePickTask")
     @SaIgnore

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PdaPickQuery.java

@@ -0,0 +1,12 @@
+package org.nl.wms.pda_manage.pick.dto;
+
+import lombok.Data;
+
+@Data
+public class PdaPickQuery {
+    private int page;
+    private int size;
+    private String form_type;
+    private String status;
+    private String vehicle_code;
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java

@@ -1,5 +1,6 @@
 package org.nl.wms.stor_manage.monitor.listener;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -61,7 +62,8 @@ public class FlowEndEventListener extends AbstraceListener<FlowEndEvent> {
                     sql.append("update ")
                             .append(baseFromCollect.contains(history.getForm_type())?history.getForm_type():"pm_form_data")
                             .append(" set status = ")
-                            .append("'"+StatusEnum.FORM_STATUS.code("完成")+"'")
+                            .append("'"+StatusEnum.FORM_STATUS.code("完成")+"' , update_time = ")
+                            .append("'"+ DateUtil.now()+"'")
                             .append(" where id = ")
                             .append("'"+history.getForm_id()+"'");
                     iPmFormDataService.dynamicSql(sql.toString());