opt:同步基础版更新

nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java

@@ -39,7 +39,6 @@ import org.nl.wms.warehouse_manage.record.service.IStIvtStructivtflowService;
 import org.nl.wms.warehouse_manage.record.service.dao.StIvtStructivtflow;
 import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
 import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
-import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +52,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
+
 /**
  * 仓位实现类
  *
@@ -405,12 +406,16 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
             String vehicleCode = vehicleMater.getStoragevehicle_code();
             BigDecimal subtract = vehicleMater.getQty().subtract(vehicleMater.getFrozen_qty());
             //100-出50 = 50
-            UpdateWrapper<GroupPlate> update = new UpdateWrapper<GroupPlate>()
-                    .set("frozen_qty", 0)
-                    .set("qty", subtract)
-                    .set("update_time", now)
-                    .eq("group_id", vehicleMater.getGroup_id());
-            iMdPbGroupplateService.update(update);
+            //如果出库是手持库出确认则不在这边变动组盘信息
+            if (!changeDto.getInBound()){
+                UpdateWrapper<GroupPlate> update = new UpdateWrapper<GroupPlate>()
+                        .set("frozen_qty", 0)
+                        .set("qty", subtract)
+                        .set("update_time", now)
+                        .set("status", GROUP_PLATE_STATUS.code("组盘"))
+                        .eq("group_id", vehicleMater.getGroup_id());
+                iMdPbGroupplateService.update(update);
+            }
             StIvtStructivtflow record = new StIvtStructivtflow();
             record.setId(IdUtil.getStringId());
             record.setUpdate_time(now);

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml

@@ -111,6 +111,7 @@
         SELECT
         pm_form_data.*,
         md_me_materialbase.material_code,
+        md_me_materialbase.material_id,
         md_me_materialbase.material_name,
         md_me_materialbase.material_spec,
         md_me_materialbase.net_weight

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/TaskStatus.java

@@ -73,4 +73,13 @@ public enum TaskStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public static String convertName(String code){
+        for (TaskStatus value : TaskStatus.values()) {
+            if (value.getCode().equals(code)){
+                return value.getName();
+            }
+        }
+        return "";
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java

@@ -434,6 +434,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 ioStorInvDisMapper.insert(ioStorInvDis);
                 allocation_canuse_qty = allocation_canuse_qty.add(outAllocation.getFrozen_qty());
                 //分配完成 结束分配
+                unassign_qty=unassign_qty.subtract(allocation_canuse_qty);
                 if (unassign_qty.doubleValue() <= 0){
                     break;
                 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java

@@ -349,7 +349,18 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
             param.put("material_code", map.get("material_code"));
             param.put("pcsn", map.get("pcsn"));
             param.put("ioType", StatusEnum.STRATEGY_TYPE.code("入库"));
-            Structattr struct = getStructattr(param);
+            List<Structattr> structattrs = iStructattrService.inBoundSectDiv(
+                    StrategyStructParam.builder()
+                            .ioType(param.getString("ioType"))
+                            .sect_code(param.getString("sect_code"))
+                            .stor_code(param.getString("stor_code"))
+                            .material_code(param.getString("material_code"))
+                            .qty(new BigDecimal(param.getString("qty")))
+                            .pcsn(param.getString("pcsn"))
+                            .build());
+            Structattr struct = structattrs.get(0);
+
+
             sect_id = struct.getSect_id();
             sect_code = struct.getSect_code();
             sect_name = struct.getSect_name();
@@ -361,12 +372,6 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
             MdPbStoragevehicleinfo mdPbStoragevehicleinfo = mdPbStoragevehicleinfoMapper.selectOne(new LambdaQueryWrapper<>(MdPbStoragevehicleinfo.class)
                     .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, map.get("storagevehicle_code"))
             );
-            //判断仓位的长高宽是否能放下载具
-            //            if (structattr.getWidth() < 0 &&
-            //                    structattr.getHeight() < 0 &&
-            //                    structattr.getZdepth() < 0) {
-            //                throw new BadRequestException("载具不符合，请检查!");
-            //            }
             sect_id = map.get("sect_id");
             sect_code = map.get("sect_code");
             sect_name = map.get("sect_name");