add：生产下线任务，缺回传单

nladmin-system/wms-server/src/main/java/org/nl/common/utils/SecurityUtils.java

@@ -23,12 +23,15 @@ public class SecurityUtils {
      * @return 系统用户
      */
     public static CurrentUser getCurrentUser() {
-        Object loginInfo = StpUtil.getExtra("loginInfo");
+        try {
-        if (loginInfo==null){
+            Object loginInfo = StpUtil.getExtra("loginInfo");
+            if (loginInfo==null){
+                return CurrentUser.getDefaultUser();
+            }
+            return JSONObject.parseObject(String.valueOf(loginInfo),CurrentUser.class);
+        }catch (Exception ex){
             return CurrentUser.getDefaultUser();
         }
-        return JSONObject.parseObject(String.valueOf(loginInfo),CurrentUser.class);
-
     }
 
     /**

nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java

@@ -16,10 +16,6 @@ public class StrategyStructParam  {
      *库区，暂时不用
      */
     private String sect_code;
-    /**
-     * 仓位编码
-     */
-    private String stor_code;
     /**
      * 同步单号
      */

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

@@ -318,7 +318,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
     @Override
     public List<StrategyStructMaterialVO> outBoundSectDiv(StrategyStructParam param) {
         //只校验仓库，库区
-        Assert.noNullElements(new Object[]{param.getStor_code(),param.getSect_code()},"请求参数不能为空");
+        Assert.noNullElements(new Object[]{param.getSect_code()},"请求参数不能为空");
         StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper<StSectStrategy>()
                 .eq(StSectStrategy::getSect_code, param.getSect_code())
                 .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("出库")));
@@ -348,7 +348,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
     @Override
     public List<Structattr> inBoundSectDiv(StrategyStructParam param) {
         //批号，单据暂时不校验，具体业务具体校验
-        Assert.noNullElements(new Object[]{param.getStrategyMaters(),param.getStor_code(),param.getSect_code()},"请求参数不能为空");
+        Assert.noNullElements(new Object[]{param.getStrategyMaters(),param.getSect_code()},"请求参数不能为空");
         StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper<StSectStrategy>()
                 .eq(StSectStrategy::getSect_code, param.getSect_code())
                 .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("入库")));

nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/FIFORuleHandler.java

@@ -45,7 +45,6 @@ public class FIFORuleHandler extends Decisioner<StrategyStructMaterialVO, Strate
         List<StructattrVechielDto> vechielDtos =
                 iStructattrService.collectVechicle(MapOf.of("material_id", strategyMater.getMaterial_id()
                 , "pcsn", strategyMater.getPcsn()
-                , "stor_code", param.getStor_code()
                 , "sect_code", param.getSect_code()
                 , "plan_qty", planQty
                 , "is_lock", "false"

nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFO2RuleHandler.java

@@ -45,7 +45,6 @@ public class FIFO2RuleHandler extends Decisioner<StrategyStructMaterialVO, Strat
                 iStructattrService.collectVechicle(MapOf.of("material_id", strategyMater.getMaterial_id()
                 , "pcsn", strategyMater.getPcsn()
                 , "inv_code", param.getInv_code()
-                , "stor_code", param.getStor_code()
                 , "sect_code", param.getSect_code()
                 , "plan_qty", planQty
                 , "order_by", "gro.update_time asc")

nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFONoStorHandler.java

@@ -44,7 +44,6 @@ public class FIFONoStorHandler extends Decisioner<StrategyStructMaterialVO, Stra
         List<StructattrVechielDto> vechielDtos =
                 iStructattrService.collectVechicle(MapOf.of("material_id", strategyMater.getMaterial_id()
                 , "pcsn", strategyMater.getPcsn()
-                , "stor_code", param.getStor_code()
                 , "sect_code", param.getSect_code()
                 , "plan_qty", planQty
                 , "is_lock", "false"

nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesStructLineController.java

@@ -5,7 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.wms.ext_manage.service.dto.StructLineOfflineDTO;
-import org.nl.wms.sch_manage.service.core.tasks.StructOfflineTask;
+import org.nl.wms.sch_manage.service.core.tasks.StructOfflineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class MesStructLineController {
 
     @Autowired
-    private StructOfflineTask structOfflineTask;
+    private StructOfflineService structOfflineTask;
 
     /**
      * 结构车间生产下料同步接口

nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java

@@ -330,7 +330,6 @@ public class PdaIosInServiceImpl implements PdaIosInService {
                 StrategyStructParam.builder()
                         .ioType(StatusEnum.STRATEGY_TYPE.code("入库"))
                         .sect_code(whereJson.getString("sect_code"))
-                        .stor_code(storeDao.getStor_code())
                         .storagevehicle_code(vehicleDao.getStoragevehicle_code())
                         .strategyMaters(materss)
                         .build());

nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java

@@ -362,7 +362,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
         StrategyStructParam strategyStructParam = StrategyStructParam.builder()
                 .ioType(whereJson.getString(StatusEnum.STRATEGY_TYPE.code("出库")))
                 .sect_code(whereJson.getString("sect_code"))
-                .stor_code(whereJson.getString("stor_code"))
                 .strategyMaters(maters)
                 .build();
         List<StrategyStructMaterialVO> structList = iStructattrService.outBoundSectDiv(strategyStructParam);

nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java

@@ -32,7 +32,7 @@ public class PdaSchPointServiceImpl extends ServiceImpl<SchBasePointMapper, SchB
     @Override
     public PdaResponse getPoint(JSONObject whereJson) {
         SchBasePoint pointDao = this.getById(whereJson.getString("point_code"));
-        pointDao.setStoragevehicle_code(pointDao.getVehicle_code());
+        pointDao.setVehicle_code(pointDao.getVehicle_code());
         return PdaResponse.requestParamOk(pointDao);
     }
 

nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/impl/PurchaseServiceImpl.java

@@ -24,12 +24,12 @@ import org.nl.wms.pm_manage.purchase.service.dao.mapper.PurchasemstMapper;
 import org.nl.wms.pm_manage.purchase.service.dto.PurchaseDto;
 import org.nl.wms.pm_manage.purchase.service.vo.PurchasemstListVo;
 import org.nl.wms.ext_manage.purchase.service.dto.EasAuditRequestDto;
+import org.nl.wms.pm_manage.purchase.util.ZplUtil;
 import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService;
 import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn;
 import org.nl.wms.warehouse_manage.stockReturn.service.enums.StockReturnStatusEnum;
 import org.nl.config.PrinterProperties;
-import org.nl.wms.pm_manage.purchase.util.ZplUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StructOfflineService.java

@@ -1,25 +1,20 @@
 package org.nl.wms.sch_manage.service.core.tasks;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sun.javafx.binding.StringFormatter;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
+import org.nl.wms.basedata_manage.service.ISectattrService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
-import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
-import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
 import org.nl.wms.ext_manage.service.dto.StructLineOfflineDTO;
-import org.nl.wms.pm_manage.purchase.ListenerHandler.PurchaseListenerParams;
 import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -28,24 +23,22 @@ import org.nl.wms.sch_manage.service.core.AcsTaskDto;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.nl.wms.warehouse_manage.inAndOut.service.IInBillService;
-import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_manage.inAndOut.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDisMapper;
-import org.nl.wms.warehouse_manage.inventory.IStInventoryService;
 import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
 import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 
-import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
-
 /**
  * 焊接区域半成品入库
  */
 @Service
-public class StructOfflineTask extends AbstractTask {
+public class StructOfflineService{
 
     @Autowired
     private IInBillService iInBillService;
@@ -59,15 +52,23 @@ public class StructOfflineTask extends AbstractTask {
     private IMdMeMaterialbaseService iMdMeMaterialbaseService;
     @Autowired
     private IStructattrService iStructattrService;
+    @Resource
+    private IOStorInvDisMapper ioStorInvDisMapper;
+
     /**
      * 生成生产入库任务，任务完成
      */
+    @Transactional
     public void offline(StructLineOfflineDTO offlineDTO){
         SchBasePoint schBasePoint = iSchBasePointService.selectByCode(offlineDTO.getUnloadPort());
-        String storagevehicleCode = schBasePoint.getStoragevehicle_code();
+        if (schBasePoint == null){
+            throw new BadRequestException(String.format("下线失败,下料点%s信息不存在",offlineDTO.getUnloadPort()));
+        }
+        String storagevehicleCode = schBasePoint.getVehicle_code();
         if (StringUtils.isEmpty(storagevehicleCode)){
             throw new BadRequestException("下线失败，下料点没有绑定托盘号");
         }
+
         final MdMeMaterialbase materialbase = iMdMeMaterialbaseService.getByCode(offlineDTO.getMaterialCode());
         if (materialbase == null){
             throw new BadRequestException("下线失败，物料编码未同步");
@@ -80,6 +81,7 @@ public class StructOfflineTask extends AbstractTask {
         plate.setCreate_time(DateUtil.now());
         plate.setMaterial_code(materialbase.getMaterial_code());
         plate.setQty(offlineDTO.getUnloadQty());
+        plate.setPcsn("1");
         plate.setQty_unit_id(materialbase.getQty_unit_id());
         plate.setQty_unit_name(materialbase.getQty_unit_id());
         plate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘"));
@@ -130,45 +132,18 @@ public class StructOfflineTask extends AbstractTask {
         // 调用分配，默认自动分配库位
         iInBillService.divStruct(divStructParam);
         // 下发任务
-        // 组织 divPoint 参数
+        final IOStorInvDis ioStorInvDis = ioStorInvDisMapper.selectOne(new LambdaQueryWrapper<IOStorInvDis>()
+                .eq(IOStorInvDis::getIostorinv_id, iostorinv_id)
+                .select(IOStorInvDis::getIostorinvdis_id));
         Map<String, Object> divPointParam = new HashMap<>();
         divPointParam.put("point_code", offlineDTO.getUnloadPort());
         ArrayList<HashMap<String, String>> tableMater = new ArrayList<>();
         HashMap<String, String> materRow = new HashMap<>();
         materRow.put("iostorinv_id", iostorinv_id);           // 入库单明细ID
-        materRow.put("iostorinvdis_id", iostorinvdis_id);     // 分配明细ID（如果有）
+        materRow.put("iostorinvdis_id", ioStorInvDis.getIostorinvdis_id());     // 分配明细ID（如果有）
         materRow.put("storagevehicle_code", storagevehicleCode); // 载具编码
         tableMater.add(materRow);
         divPointParam.put("tableMater", tableMater);
         iInBillService.divPoint(divPointParam);
     }
-
-    @Override
-    public String create(JSONObject json) {
-
-
-        String task_id = stInTask.create(task_form);
-        return null;
-    }
-
-    @Override
-    public AcsTaskDto sendAcsParam(String taskId) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-
-    }
-
-    @Override
-    public void cancel(String task_code) {
-
-    }
-
 }

nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java

@@ -124,39 +124,4 @@ public class SchBasePoint implements Serializable {
     private String update_time;
 
     private String ios_id;
-
-    @TableField(exist = false)
-    private List<String> can_vehicle_types;
-
-    @TableField(exist = false)
-    private String point_type_name;
-
-    @TableField(exist = false)
-    private String point_status_name;
-
-    // 组盘标识
-    @TableField(exist = false)
-    private String group_id;
-
-    @TableField(exist = false)
-    private String record_id;
-
-    @TableField(exist = false)
-    private String device_code;
-    @TableField(exist = false)
-    private String material_qty;
-    @TableField(exist = false)
-    private String material_code;
-    @TableField(exist = false)
-    private String material_name;
-    @TableField(exist = false)
-    private String material_spec;
-    @TableField(exist = false)
-    private String material_model;
-    @TableField(exist = false)
-    private String raw_material_code;
-    @TableField(exist = false)
-    private String task_warn;
-    @TableField(exist = false)
-    private String storagevehicle_code;
 }

nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java

@@ -59,27 +59,6 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
     public IPage<SchBasePoint> queryAll(SchBasePointQuery whereJson, PageQuery page) {
         IPage<SchBasePoint> pages = new Page<>(page.getPage() + 1, page.getSize());
         pages = pointMapper.selectPageLeftJoin(pages, whereJson);
-        // 可以存放的载具类型
-        pages.getRecords().forEach(point -> {
-            if (ObjectUtil.isNotEmpty(point.getCan_vehicle_type())) {
-                point.setCan_vehicle_types(Arrays.asList(point.getCan_vehicle_type().split(",")));
-            }
-            String pointStatus = point.getPoint_status(); // 点位状态
-            String pointType = point.getPoint_type(); // 点位类型
-            SchBaseRegion regionObj = regionMapper.selectById(point.getRegion_code());
-            if (ObjectUtil.isNotEmpty(regionObj)) {
-                if (ObjectUtil.isNotEmpty(pointStatus) && ObjectUtil.isNotEmpty(regionObj.getPoint_status_explain())) {
-                    // 设置
-                    point.setPoint_status_name(PointUtils.getStatusOrTypeName(
-                            regionObj.getPoint_status_explain(), pointStatus));
-                }
-                if (ObjectUtil.isNotEmpty(pointType) && ObjectUtil.isNotEmpty(regionObj.getPoint_type_explain())) {
-                    // 设置
-                    point.setPoint_type_name(PointUtils.getStatusOrTypeName(
-                            regionObj.getPoint_type_explain(), pointType));
-                }
-            }
-        });
         return pages;
     }
 
@@ -97,11 +76,6 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
             entity.setParent_point_code(entity.getPoint_code());
         }
 
-        if (ObjectUtil.isNotEmpty(entity.getCan_vehicle_types())) {
-            String can_vehicle_type = String.join(",", entity.getCan_vehicle_types());
-            entity.setCan_vehicle_type(can_vehicle_type);
-        }
-
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
@@ -131,10 +105,6 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         // 获取region_name
         SchBaseRegion baseRegion = regionMapper.selectById(entity.getRegion_code());
         entity.setRegion_name(baseRegion.getRegion_name());
-        if (ObjectUtil.isNotEmpty(entity.getCan_vehicle_types())) {
-            String can_vehicle_type = String.join(",", entity.getCan_vehicle_types());
-            entity.setCan_vehicle_type(can_vehicle_type);
-        }
         String pointStatus = entity.getPoint_status();
         // 根据点位状态来判断更新内容
         if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals(PointStatusEnum.EMPTY_POINT.getCode())) {

nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java

@@ -137,7 +137,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         JSONObject result;
         switch (method_name) {
             case "immediateNotifyAcs":
-                //
                 break;
             // 强制完成
             case "forceFinish":
@@ -146,9 +145,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             case "cancel":
                 abstractTask.cancel(task_code);
                 break;
-            case "back":
-                abstractTask.backMes(task_code);
-                break;
             default:
                 break;
         }

nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java

@@ -387,7 +387,6 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
                     StrategyStructParam.builder()
                             .ioType(StatusEnum.STRATEGY_TYPE.code("入库"))
                             .sect_code(param.getString("sect_code"))
-                            .stor_code(param.getString("stor_code"))
                             .storagevehicle_code(param.getString("storagevehicle_code"))
                             .strategyMaters(maters)
                             .build());

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

@@ -397,7 +397,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             list.add(mater);
             List<StrategyStructMaterialVO> structMaterials = iStructattrService.outBoundSectDiv(
                     StrategyStructParam.builder()
-                            .stor_code(ioStorInv.getStor_code())
                             .sect_code(sectCode)
                             .strategyMaters(list)
                             .build()
@@ -572,7 +571,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             //调用分配规则获取分配的库位:如果库存不足则直接报错
             List<StrategyStructMaterialVO> structMaterials = iStructattrService.outBoundSectDiv(
                     StrategyStructParam.builder()
-                            .stor_code(ioStorInv.getStor_code())
                             .sect_code(sectCode)
                             .inv_code(ioStorInv.getBill_code())
                             .strategyMaters(list)