add:字段

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/HeartClientServer.java

@@ -21,6 +21,7 @@ import org.nl.config.lucene.remote.coder.LogConsumerHandler;
 
 import java.net.ConnectException;
 import java.net.SocketAddress;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java

@@ -129,6 +129,10 @@ public class MdPbVehicleMater implements Serializable {
      * 流程实例
      */
     private String proc_inst_id;
+    /**
+     * 是否需要拣选（针对托盘）
+     */
+    private Boolean need_pick = Boolean.FALSE;
 
 
 }

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

@@ -131,7 +131,8 @@ public class PdaIOService {
             }
             String storCode = pdaFormOutMst.getStor_code();
             if (StringUtils.isEmpty(storCode)){
-                throw new BadRequestException("出库申请失败：明细数据仓库字段未指定");
+                storCode="FStockId";
+//                throw new BadRequestException("出库申请失败：明细数据仓库字段未指定");
             }
 
             HashMap map = MapOf.of("end_struct_code", "", "start_struct_code", "", "order", "", "product_area", productArea);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml

@@ -152,6 +152,7 @@
         left join md_pb_vehicleMater vm on struct.vehicle_code = vm.vehicle_code
         left join md_me_materialbase material on vm.material_id = material.material_id
         where struct.vehicle_code is not null
+        and struct.stor_code = #{stor_code}
         and vm.is_delete = false
         and struct.lock_type = '00'
         and struct.is_used = '1'

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java

@@ -88,16 +88,26 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
         List<StIvtStructivtflow> records = new ArrayList<>();
         StIvtStructattr attr = this.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", struct_code).select("stor_code"));
         //更新冻结数量
+
         for (MdPbVehicleMater vehicleMater : vehicleMaters) {
-            vehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>()
-                    .set("frozen_qty",0)
-                    .set("proc_inst_id",null)
-                    .set("update_time",DateUtil.now())
-                    .eq("id",vehicleMater.getId()));
+
+            String vehicleCode = vehicleMater.getVehicle_code();
+            BigDecimal subtract = vehicleMater.getQty().subtract(vehicleMater.getFrozen_qty());
+
+            UpdateWrapper<MdPbVehicleMater> update = new UpdateWrapper<MdPbVehicleMater>()
+                    .set("frozen_qty", 0)
+                    .set("qty", subtract)
+                    .set("proc_inst_id", null)
+                    .set("update_time", DateUtil.now())
+                    .eq("id", vehicleMater.getId());
+            if (vehicleCode.contains("T") && subtract.intValue()>0){
+                update.set("need_pick",true);
+            }
+            vehicleMaterService.update(update);
             StIvtStructivtflow record = new StIvtStructivtflow();
             record.setId(IdUtil.getStringId());
             record.setUpdate_time(DateUtil.now());
-            record.setVehicle_code(vehicleMater.getVehicle_code());
+            record.setVehicle_code(vehicleCode);
             record.setMaterial_id(vehicleMater.getMaterial_id());
             record.setPcsn(vehicleMater.getPcsn());
             record.setQty(vehicleMater.getQty());

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.java

@@ -18,7 +18,6 @@ import java.util.Map;
  */
 public interface SysDictMapper extends BaseMapper<Dict> {
 
-    @Select( "select ${label} as label,${value} as value from ${table}")
     List<Map> dynamicTableEnum(@Param("table") String table, @Param("label")String label, @Param("value")String value);
 
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper">
 
+    <select id="dynamicTableEnum" resultType="java.util.Map">
+        select ${label} as label,${value} as value from ${table}
+        <if test="table == 'st_ivt_bsrealstorattr' ">
+            where is_used = '1'
+        </if>
+    </select>
 </mapper>