Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,7 @@ public enum AcsTaskEnum {
     TASK_STRUCT_BCP_EMPOUT("17","半成品-空托盘出库"),
     TASK_STRUCT_CP_MOVE("18","成品-移库"),
     TASK_STRUCT_BCP_MOVE("19","半成品-移库"),
+    TASK_STRUCT_BCP_HR_MOVE("20","三线半成品-移库"),
 
     TASK_STRUCT_HR_IN("26","入库-海柔半成品-生产入库"),
     TASK_STRUCT_HR_OUT("27","出库-海柔半成品-生产出库"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java

@@ -21,6 +21,7 @@ import org.nl.wms.storage_manage.semimanagehr.service.check.IStIvtCheckmstHrBcpS
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvEmpBcpService;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpInService;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpOutService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvHrBcpService;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -101,6 +102,10 @@ public enum TASKEnum implements FunctionStrategy<String, JSONObject> {
         IStIvtIostorinvEmpBcpService bean = SpringContextHolder.getBean(IStIvtIostorinvEmpBcpService.class);
         bean.taskOperateOut(form);
     }),
+    HR_BCP_EMP_MOVE_TASK(type -> AcsTaskEnum.TASK_STRUCT_BCP_HR_MOVE.getCode().equals(type), form -> {
+        IStIvtMoveinvHrBcpService bean = SpringContextHolder.getBean(IStIvtMoveinvHrBcpService.class);
+        bean.taskOperate(form);
+    }),
 
     ;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/moveIvt/StIvtMoveinvHrBcpController.java

@@ -0,0 +1,73 @@
+package org.nl.wms.storage_manage.semimanagehr.controller.moveIvt;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvdtlHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvHrBcp;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dto.MoveInvHrBcpQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 移库单主表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@RestController
+@RequestMapping("/api/stIvtMoveinvHrBcp")
+public class StIvtMoveinvHrBcpController {
+
+    @Autowired
+    private IStIvtMoveinvHrBcpService moveinvHrBcpService;
+
+    @Autowired
+    private IStIvtMoveinvdtlHrBcpService iStIvtMoveinvdtlHrBcpService;
+
+    @GetMapping
+    @Log("查询移库主表")
+    //("查询盘点单主表")
+    public ResponseEntity<Object> query(MoveInvHrBcpQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(moveinvHrBcpService.page(page.build(StIvtMoveinvHrBcp.class),query.build())), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("创建移库单")
+    //("创建盘点单")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        moveinvHrBcpService.create(whereJson);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
+
+    @PostMapping("/getMoveDtl")
+    @Log("查询盘点明细")
+    //("查询盘点明细")
+    public ResponseEntity<Object> getCheckDtl(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(TableDataInfo.build(iStIvtMoveinvdtlHrBcpService.listJoinTask(whereJson.getString("moveinv_id"))), HttpStatus.OK);
+    }
+
+    @PostMapping("/update")
+    @Log("更新单据")
+    //("查询盘点明细")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        moveinvHrBcpService.update(whereJson);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
+
+    @PostMapping("/cancel")
+    @Log("取消单据")
+    //("查询盘点明细")
+    public ResponseEntity<Object> cancel(@RequestBody JSONObject whereJson) {
+        moveinvHrBcpService.cancel(whereJson);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/moveIvt/StIvtMoveinvdtlHrBcpController.java

@@ -0,0 +1,32 @@
+package org.nl.wms.storage_manage.semimanagehr.controller.moveIvt;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvdtlHrBcpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 移库单明细表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@RestController
+@RequestMapping("/api/stIvtMoveinvdtlHrBcp")
+public class StIvtMoveinvdtlHrBcpController {
+
+    @Autowired
+    private IStIvtMoveinvdtlHrBcpService iStIvtMoveinvdtlHrBcpService;
+
+    @PostMapping("/task/{option}")
+    public ResponseEntity<Object> optionTask(@RequestBody JSONObject form, @PathVariable String option){
+        iStIvtMoveinvdtlHrBcpService.taskOption(form,option);
+        return new ResponseEntity<>(HttpStatus.OK);
+    };
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/structLvt/StIvtStructivtHrBcpController.java

@@ -8,6 +8,7 @@ import org.nl.common.anno.Log;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.ListOf;
 import org.nl.common.utils.MapOf;
+import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StIvtStructivtBcpVo;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtHrBcpService;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dto.StructIvtHrBcpQuery;
@@ -59,6 +60,13 @@ public class StIvtStructivtHrBcpController {
         return new ResponseEntity<>(bcpService.getBcpIvt(query, page), HttpStatus.OK);
     }
 
+    @GetMapping("/getBcpMoveIvt")
+    @Log("查询可用的半成品库存(移库)")
+    //("查询可用的半成品库存")
+    public ResponseEntity<Object> getBcpIvt(StructIvtYLQuery query, PageQuery page) {
+        return new ResponseEntity<>(bcpService.getBcpMoveIvt(query, page), HttpStatus.OK);
+    }
+
     @PostMapping("/getBcpIvtInfo")
     @Log("查询可用的半成品库存")
     //("查询可用的半成品库存")

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

@@ -324,7 +324,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl<StIvtIostorinv
             //分配货位。下发任务，更新主单据状态。更新明细任务
             StIvtSectattr sect = sectattrService.getOne(
                     new QueryWrapper<StIvtSectattr>().lambda()
-                            .eq(StIvtSectattr::getSect_name, "海柔半成品库区")
+                            .eq(StIvtSectattr::getSect_code, "HKQ001")
             );
             JSONObject jo = new JSONObject();
             jo.put("sect_id", sect.getSect_id());

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/IStIvtMoveinvHrBcpService.java

@@ -0,0 +1,35 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvHrBcp;
+
+/**
+ * <p>
+ * 移库单主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+public interface IStIvtMoveinvHrBcpService extends IService<StIvtMoveinvHrBcp> {
+    /**
+     * 新增
+     * @param form
+     */
+    void create(JSONObject form);
+
+    /**
+     * 更新
+     * @param form
+     */
+    void update(JSONObject form);
+
+    void cancel(JSONObject form);
+
+    /**
+     * 任务回调处理
+     * @param form
+     */
+    void taskOperate(JSONObject form);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/IStIvtMoveinvdtlHrBcpService.java

@@ -0,0 +1,23 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvdtlHrBcp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 移库单明细表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+public interface IStIvtMoveinvdtlHrBcpService extends IService<StIvtMoveinvdtlHrBcp> {
+
+    List<Map> listJoinTask(String moveinv_id);
+
+    void taskOption(JSONObject form, String option);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/StIvtMoveinvHrBcp.java

@@ -0,0 +1,143 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 移库单主表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("st_ivt_moveinv_hr_bcp")
+public class StIvtMoveinvHrBcp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 移库单标识
+     */
+    @TableId(value = "moveinv_id")
+    private String moveinv_id;
+
+    /**
+     * 单据编号
+     */
+    private String bill_code;
+
+    /**
+     * 业务类型
+     */
+    private String buss_type;
+
+    /**
+     * 单据类型
+     */
+    private String bill_type;
+
+    /**
+     * 业务日期
+     */
+    private String biz_date;
+
+    /**
+     * 仓库标识
+     */
+    private String stor_id;
+
+    /**
+     * 仓库编码
+     */
+    private String stor_code;
+
+    /**
+     * 仓库名称
+     */
+    private String stor_name;
+
+    /**
+     * 总数量
+     */
+    private BigDecimal total_qty;
+
+    /**
+     * 明细数
+     */
+    private Integer dtl_count;
+
+    /**
+     * 单据状态
+     */
+    private String bill_status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 生成方式
+     */
+    private String create_mode;
+
+    /**
+     * 制单人
+     */
+    private String create_id;
+
+    /**
+     * 制单人姓名
+     */
+    private String create_name;
+
+    /**
+     * 制单时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_id;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_name;
+
+    /**
+     * 修改时间
+     */
+    private String update_time;
+
+    /**
+     * 部门ID
+     */
+    private String sysdeptid;
+
+    /**
+     * 公司ID
+     */
+    private String syscompanyid;
+
+    /**
+     * 是否删除
+     */
+    private Boolean is_delete;
+
+    /**
+     * 车间标识
+     */
+    private String product_area;
+
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/StIvtMoveinvdtlHrBcp.java

@@ -0,0 +1,198 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 移库单明细表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("st_ivt_moveinvdtl_hr_bcp")
+public class StIvtMoveinvdtlHrBcp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 移库单明细标识
+     */
+    @TableId(value = "moveinvdtl_id")
+    private String moveinvdtl_id;
+
+    /**
+     * 移库单标识
+     */
+    private String moveinv_id;
+
+    /**
+     * 明细序号
+     */
+    private Integer seq_no;
+
+    /**
+     * 转出库区标识
+     */
+    private String turnout_sect_id;
+
+    /**
+     * 转出库区编码
+     */
+    private String turnout_sect_code;
+
+    /**
+     * 转出库区名称
+     */
+    private String turnout_sect_name;
+
+    /**
+     * 转出仓位标识
+     */
+    private String turnout_struct_id;
+
+    /**
+     * 转出仓位编码
+     */
+    private String turnout_struct_code;
+
+    /**
+     * 转出仓位名称
+     */
+    private String turnout_struct_name;
+
+    /**
+     * 物料标识
+     */
+    private String material_id;
+    private String material_code;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
+
+    /**
+     * 品质类型
+     */
+    private String quality_scode;
+
+    /**
+     * 库存等级
+     */
+    private String ivt_level;
+
+    /**
+     * 是否可用
+     */
+    private Boolean is_active;
+
+    /**
+     * 数量计量单位标识
+     */
+    private String qty_unit_id;
+
+    /**
+     * 数量计量单位名称
+     */
+    private String qty_unit_name;
+
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+    /**
+     * 单重
+     */
+    private BigDecimal unit_weight;
+
+    /**
+     * 转入库区标识
+     */
+    private String turnin_sect_id;
+
+    /**
+     * 转入库区编码
+     */
+    private String turnin_sect_code;
+
+    /**
+     * 转入库区名称
+     */
+    private String turnin_sect_name;
+
+    /**
+     * 转入仓位标识
+     */
+    private String turnin_struct_id;
+
+    /**
+     * 转入仓位编码
+     */
+    private String turnin_struct_code;
+
+    /**
+     * 转入仓位名称
+     */
+    private String turnin_struct_name;
+
+    /**
+     * 执行状态
+     */
+    private String bill_status;
+
+    /**
+     * 任务标识
+     */
+    private String task_id;
+
+    /**
+     * 存储载具标识
+     */
+    private String storagevehicle_id;
+
+    /**
+     * 存储载具编码
+     */
+    private String storagevehicle_code;
+
+    /**
+     * 是否已下发
+     */
+    private Boolean is_issued;
+
+    /**
+     * 来源单据明细标识
+     */
+    private String source_billdtl_id;
+
+    /**
+     * 来源单据类型
+     */
+    private String source_bill_type;
+
+    /**
+     * 来源单编号
+     */
+    private String source_bill_code;
+
+    /**
+     * 来源单表名
+     */
+    private String source_bill_table;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/mapper/StIvtMoveinvHrBcpMapper.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvHrBcp;
+
+/**
+ * <p>
+ * 移库单主表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+public interface StIvtMoveinvHrBcpMapper extends BaseMapper<StIvtMoveinvHrBcp> {
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/mapper/StIvtMoveinvdtlHrBcpMapper.java

@@ -0,0 +1,20 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvdtlHrBcp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 移库单明细表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+public interface StIvtMoveinvdtlHrBcpMapper extends BaseMapper<StIvtMoveinvdtlHrBcp> {
+
+    List<Map> listJoinTask(String moveinv_id);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/mapper/xml/StIvtMoveinvHrBcpMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper.StIvtMoveinvHrBcpMapper">
+
+</mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dao/mapper/xml/StIvtMoveinvdtlHrBcpMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper.StIvtMoveinvdtlHrBcpMapper">
+    <select id="listJoinTask" resultType="java.util.Map">
+        SELECT
+            st_ivt_moveinvdtl_hr_bcp.*,
+            sch_base_task.task_code,
+            sch_base_task.task_status
+        FROM
+            st_ivt_moveinvdtl_hr_bcp
+            LEFT JOIN sch_base_task ON st_ivt_moveinvdtl_hr_bcp.task_id = sch_base_task.task_id
+        where
+            moveinv_id = #{moveinv_id}
+    </select>
+</mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/dto/MoveInvHrBcpQuery.java

@@ -0,0 +1,34 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvHrBcp;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class MoveInvHrBcpQuery extends BaseQuery<StIvtMoveinvHrBcp> {
+
+
+    private String stor_id;
+
+    private String bill_status;
+
+    private String bill_type;
+
+    private String bill_code;
+
+    private Boolean is_delete = false;
+
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("bill_code", QParam.builder().k(new String[]{"bill_code"}).type(QueryTEnum.LK).build());
+    }
+
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvHrBcpServiceImpl.java

@@ -0,0 +1,455 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.enums.AcsTaskEnum;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
+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.IVTEnum;
+import org.nl.wms.storage_manage.MoveInvEnum;
+import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
+import org.nl.wms.storage_manage.semimanage.service.moveInv.dao.StIvtMoveinvdtlBcp;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvdtlHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvHrBcp;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvdtlHrBcp;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper.StIvtMoveinvHrBcpMapper;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtflowHrService;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.StIvtStructivtHrBcp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 移库单主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@Service
+public class StIvtMoveinvHrBcpServiceImpl extends ServiceImpl<StIvtMoveinvHrBcpMapper, StIvtMoveinvHrBcp> implements IStIvtMoveinvHrBcpService {
+
+    @Autowired
+    private IStIvtMoveinvdtlHrBcpService iStIvtMoveinvdtlHrBcpService; // 移库明细服务
+
+    @Autowired
+    private IStIvtStructattrService structattrService; // 仓位服务
+
+    @Autowired
+    private IStIvtStructivtflowHrService iStIvtStructivtflowService; // 库存变动服务
+
+    @Autowired
+    private IStIvtStructivtHrBcpService iStIvtStructivtHrBcpService; //库存服务
+
+    @Autowired
+    private ISchBaseTaskService taskService; // 任务服务
+
+    @Override
+    @Transactional
+    public void create(JSONObject form) {
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+
+        // 调用主表 插入/更新方法
+        StIvtMoveinvHrBcp mst = new StIvtMoveinvHrBcp();
+
+        // 新增
+        mst.setMoveinv_id(IdUtil.getStringId());
+        mst.setBill_code(CodeUtil.getNewCode("BCP_MOVE_CODE"));
+        mst.setBuss_type(form.getString("buss_type"));
+        mst.setBill_type(form.getString("buss_type"));
+        mst.setStor_id(form.getString("stor_id"));
+        mst.setStor_name(form.getString("stor_name"));
+        mst.setStor_code(form.getString("stor_code"));
+        mst.setBiz_date(DateUtil.today());
+        mst.setBill_status(MoveInvEnum.BILL_STATUS.code("生成"));
+        mst.setDtl_count(form.getInteger("dtl_num"));
+        mst.setCreate_id(SecurityUtils.getCurrentUserId());
+        mst.setCreate_name(SecurityUtils.getCurrentNickName());
+        mst.setCreate_time(DateUtil.now());
+        mst.setIs_delete(false);
+        mst.setRemark(form.getString("remark"));
+
+        //调用明细表 插入方法
+        List<StIvtMoveinvdtlHrBcp> itemList = new ArrayList<>();
+        Set<String> lockInStructList = new HashSet<>();
+        Set<String> lockOutStructList = new HashSet<>();
+        BigDecimal total = new BigDecimal(0);
+
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject item = rows.getJSONObject(i);
+
+            if (StringUtils.isEmpty(item.getString("turnin_struct_id"))){
+                throw new BadRequestException("移入货位没有配置齐全");
+            }
+
+            StIvtMoveinvdtlHrBcp moveinvdtlCp = new StIvtMoveinvdtlHrBcp();
+            moveinvdtlCp.setMoveinv_id(mst.getMoveinv_id());
+            moveinvdtlCp.setMoveinvdtl_id(IdUtil.getStringId());
+            moveinvdtlCp.setSeq_no(i+1);
+            moveinvdtlCp.setBill_status(mst.getBill_status());
+            moveinvdtlCp.setSource_bill_type(item.getString("bill_type"));
+
+            material: {
+                moveinvdtlCp.setIs_active(true);
+                moveinvdtlCp.setIvt_level(IVTEnum.IVT_LEVEL.code("一级"));
+                moveinvdtlCp.setIs_issued(true);
+                moveinvdtlCp.setMaterial_id(item.getString("material_id"));
+                moveinvdtlCp.setMaterial_code(item.getString("material_code"));
+                moveinvdtlCp.setQty(item.getBigDecimal("canuse_qty"));
+                moveinvdtlCp.setUnit_weight(item.getBigDecimal("unit_weight"));
+                moveinvdtlCp.setPcsn(item.getString("pcsn"));
+                moveinvdtlCp.setQty_unit_id(item.getString("qty_unit_id"));
+                moveinvdtlCp.setQty_unit_name(item.getString("qty_unit_name"));
+                moveinvdtlCp.setQuality_scode(item.getString("quality_scode"));
+                moveinvdtlCp.setStoragevehicle_code(item.getString("storagevehicle_code"));
+            }
+
+            target: {
+                moveinvdtlCp.setTurnin_sect_code(item.getString("sect_code"));
+                moveinvdtlCp.setTurnin_sect_id(item.getString("sect_id"));
+                moveinvdtlCp.setTurnin_sect_name(item.getString("sect_name"));
+                moveinvdtlCp.setTurnin_struct_code(item.getString("turnin_struct_code"));
+                moveinvdtlCp.setTurnin_struct_name(item.getString("turnin_struct_name"));
+                moveinvdtlCp.setTurnin_struct_id(item.getString("turnin_struct_id"));
+            }
+
+            source:{
+                moveinvdtlCp.setTurnout_sect_code(item.getString("sect_code"));
+                moveinvdtlCp.setTurnout_sect_id(item.getString("sect_id"));
+                moveinvdtlCp.setTurnout_sect_name(item.getString("sect_name"));
+                moveinvdtlCp.setTurnout_struct_code(item.getString("struct_code"));
+                moveinvdtlCp.setTurnout_struct_name(item.getString("struct_name"));
+                moveinvdtlCp.setTurnout_struct_id(item.getString("struct_id"));
+            }
+
+            total.add(moveinvdtlCp.getQty());
+            itemList.add(moveinvdtlCp);
+            lockInStructList.add(moveinvdtlCp.getTurnin_struct_code());
+            lockOutStructList.add(moveinvdtlCp.getTurnout_struct_code());
+        }
+
+        if (lockInStructList.size()!=lockOutStructList.size()){
+            throw new BadRequestException("不允许选择相同货位进行分配");
+        }
+
+        lockInStructList.addAll(lockOutStructList);
+
+        //校验点位有没有锁定
+        List<StIvtStructattr> list = structattrService.list(new QueryWrapper<StIvtStructattr>()
+                .in("struct_code", lockInStructList)
+                .nested(i -> i.eq("is_used", false)
+                        .or()
+                        .gt("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))));
+        if (!CollectionUtils.isEmpty(list)){
+            throw new BadRequestException("选择点位已经锁定禁用:"+list.stream().map(StIvtStructattr::getStruct_code).collect(Collectors.joining(",")));
+        }
+
+        mst.setTotal_qty(total);
+        this.save(mst);
+        iStIvtMoveinvdtlHrBcpService.saveBatch(itemList);
+        lockInStructList.addAll(lockOutStructList);
+        structattrService.update(
+                new UpdateWrapper<StIvtStructattr>().lambda()
+                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("移库锁"))
+                        .set(StIvtStructattr::getInv_code,mst.getBill_code())
+                        .in(StIvtStructattr::getStruct_code, lockInStructList)
+        );
+    }
+
+
+    @Override
+    @Transactional
+    public void update(JSONObject form) {
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+
+        List<StIvtMoveinvdtlHrBcp> dtlList = iStIvtMoveinvdtlHrBcpService.list(new QueryWrapper<StIvtMoveinvdtlHrBcp>().eq("moveinv_id", form.getString("moveinv_id")));
+        //调用明细表 插入方法
+        Set<String> unLockStructList = new HashSet<>();
+        for (StIvtMoveinvdtlHrBcp cp : dtlList) {
+            unLockStructList.add(cp.getTurnin_struct_code());
+            unLockStructList.add(cp.getTurnout_struct_code());
+        }
+
+        structattrService.update(
+                new UpdateWrapper<StIvtStructattr>().lambda()
+                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
+                        .set(StIvtStructattr::getInv_code,"")
+                        .in(StIvtStructattr::getStruct_code, unLockStructList)
+        );
+
+        List<StIvtMoveinvdtlHrBcp> itemList = new ArrayList<>();
+        Set<String> lockOutStructList = new HashSet<>();
+        Set<String> lockInStructList = new HashSet<>();
+
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject item = rows.getJSONObject(i);
+            StIvtMoveinvdtlHrBcp moveinvdtlCp = JSONObject.parseObject(JSON.toJSONString(item), StIvtMoveinvdtlHrBcp.class);
+
+            source:{
+                moveinvdtlCp.setTurnout_struct_code(item.getString("struct_code"));
+                moveinvdtlCp.setTurnout_struct_name(item.getString("struct_name"));
+                moveinvdtlCp.setTurnout_struct_id(item.getString("struct_id"));
+            }
+
+            itemList.add(moveinvdtlCp);
+            lockInStructList.add(moveinvdtlCp.getTurnin_struct_code());
+            lockOutStructList.add(moveinvdtlCp.getTurnout_struct_code());
+        }
+
+        if (lockOutStructList.size()!=lockInStructList.size()){
+            throw new BadRequestException("不允许选择相同货位进行分配");
+        }
+
+        lockInStructList.addAll(lockOutStructList);
+        //校验点位有没有锁定
+        List<StIvtStructattr> list = structattrService.list(new QueryWrapper<StIvtStructattr>()
+                .in("struct_code", lockInStructList)
+                .nested(i -> i.eq("is_used", false)
+                        .or()
+                        .gt("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))));
+        if (!CollectionUtils.isEmpty(list)){
+            throw new BadRequestException("选择点位已经锁定禁用:"+list.stream().map(StIvtStructattr::getStruct_code).collect(Collectors.joining(",")));
+        }
+
+        iStIvtMoveinvdtlHrBcpService.updateBatchById(itemList);
+
+        structattrService.update(
+                new UpdateWrapper<StIvtStructattr>().lambda()
+                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("移库锁"))
+                        .set(StIvtStructattr::getInv_code,form.getString("bill_code"))
+                        .in(StIvtStructattr::getStruct_code, lockInStructList)
+        );
+    }
+
+    @Override
+    @Transactional
+    public void cancel(JSONObject form) {
+        List<StIvtMoveinvdtlHrBcp> dtlList = iStIvtMoveinvdtlHrBcpService.list(new QueryWrapper<StIvtMoveinvdtlHrBcp>().eq("moveinv_id", form.getString("moveinv_id")));
+
+        //调用明细表 插入方法
+        Set<String> unLockStructList = new HashSet<>();
+
+        for (StIvtMoveinvdtlHrBcp cp : dtlList) {
+            if (cp.getBill_status().equals(MoveInvEnum.BILL_STATUS.code("完成"))||cp.getBill_status().equals(MoveInvEnum.BILL_STATUS.code("移库中"))){
+                throw new BadRequestException("存在已完成明细不允许直接取消单据");
+            }
+
+            unLockStructList.add(cp.getTurnin_struct_code());
+            unLockStructList.add(cp.getTurnout_struct_code());
+        }
+
+        structattrService.update(
+                new UpdateWrapper<StIvtStructattr>().lambda()
+                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
+                        .set(StIvtStructattr::getInv_code,"")
+                        .in(StIvtStructattr::getStruct_code, unLockStructList)
+        );
+
+        iStIvtMoveinvdtlHrBcpService.update(new UpdateWrapper<StIvtMoveinvdtlHrBcp>()
+                .set("bill_status",MoveInvEnum.BILL_STATUS.code("取消"))
+                .set("task_id","").eq("moveinv_id", form.getString("moveinv_id")));
+
+        this.update(new UpdateWrapper<StIvtMoveinvHrBcp>()
+                .set("bill_status",MoveInvEnum.BILL_STATUS.code("取消"))
+                .set("update_name",SecurityUtils.getCurrentUsername())
+                .set("update_id",SecurityUtils.getCurrentUserId())
+                .set("update_time",DateUtil.now())
+                .eq("moveinv_id", form.getString("moveinv_id")));
+    }
+
+
+    @Override
+    public void taskOperate(JSONObject form) {
+        AcsTaskEnum status = AcsTaskEnum.getType(form.getString("status"),"status_");
+
+        List<StIvtMoveinvdtlHrBcp> dtls = iStIvtMoveinvdtlHrBcpService.list(new QueryWrapper<StIvtMoveinvdtlHrBcp>()
+                .eq("task_id", form.getString("task_id")));
+
+        if (CollectionUtils.isEmpty(dtls)){
+            return;
+        }
+
+        StIvtMoveinvHrBcp mst = this.getById(dtls.get(0).getMoveinv_id());
+
+        switch (status){
+            case STATUS_START:
+                mst.setBill_status(MoveInvEnum.BILL_STATUS.code("移库中"));
+                mst.setUpdate_time(DateUtil.now());
+                mst.setUpdate_name("acs");
+                this.updateById(mst);
+
+                // 更新任务
+                taskService.update(
+                        new UpdateWrapper<SchBaseTask>().lambda()
+                        .eq(SchBaseTask::getTask_id, form.getString("task_id"))
+                        .set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode())
+                );
+
+                break;
+            case STATUS_FINISH:
+
+                StIvtStructattr one = structattrService.getOne(new QueryWrapper<StIvtStructattr>()
+                        .eq("struct_id", dtls.get(0).getTurnin_struct_id())
+                        .eq("storagevehicle_code", dtls.get(0).getStoragevehicle_code()));
+
+                if (one==null){
+                    for (StIvtMoveinvdtlHrBcp dtl : dtls) {
+                        if (!dtl.getBill_status().equals(MoveInvEnum.BILL_STATUS.code("完成"))){
+                            //新增库存
+                            StIvtStructivtHrBcp ivtDao = StIvtStructivtHrBcp.builder()
+                                    .struct_id(dtl.getTurnin_struct_id())
+                                    .struct_code(dtl.getTurnin_struct_code())
+                                    .struct_name(dtl.getTurnin_struct_name())
+                                    .material_id(dtl.getMaterial_id())
+                                    .quality_scode(dtl.getQuality_scode())
+                                    .pcsn(dtl.getPcsn())
+                                    .ivt_level(dtl.getIvt_level())
+                                    .is_active(dtl.getIs_active())
+                                    .qty_unit_id("2")
+                                    .instorage_time(DateUtil.now())
+                                    .stor_id(mst.getStor_id())
+                                    .canuse_qty(dtl.getQty())
+                                    .workshop_id(mst.getProduct_area())
+                                    .unit_weight(dtl.getUnit_weight())
+                                    .build();
+                            新增库存: {
+                                iStIvtStructivtHrBcpService.save(ivtDao);
+                                // 插入库存变动记录
+                                JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao));
+                                param.put("change_type", ChangeIvtUtil.ADD_SUBIVT_QTY);
+                                param.put("change_qty", ivtDao.getCanuse_qty());
+                                param.put("result_qty", ivtDao.getCanuse_qty());
+                                param.put("bill_code",mst.getBill_code());
+                                param.put("inv_id",mst.getMoveinv_id());
+                                param.put("bill_type_scode",IOSEnum.IO_TYPE.code("移库"));
+                                iStIvtStructivtflowService.insetIvtChange(param);
+                                //维护载具
+                                structattrService.update(new UpdateWrapper<StIvtStructattr>().lambda()
+                                        .eq(StIvtStructattr::getStruct_code, dtl.getTurnin_struct_code())
+                                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
+                                        .set(StIvtStructattr::getIs_emptyvehicle,false)
+                                        .set(StIvtStructattr::getInv_code, "")
+                                        .set(StIvtStructattr::getStoragevehicle_code, dtl.getStoragevehicle_code()));
+                            }
+
+                            减库存:{
+                                iStIvtStructivtHrBcpService.remove(new QueryWrapper<StIvtStructivtHrBcp>().eq("struct_id", dtl.getTurnout_struct_id()));
+                                ivtDao.setStruct_id(dtl.getTurnout_struct_id());
+                                ivtDao.setStruct_code(dtl.getTurnout_struct_code());
+                                ivtDao.setStruct_name(dtl.getTurnout_struct_name());
+                                JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao));
+                                param.put("change_type", ChangeIvtUtil.SUB_SUBIVT_QTY);
+                                param.put("change_qty", dtl.getQty());
+                                param.put("result_qty", 0);
+                                param.put("bill_code",mst.getBill_code());
+                                param.put("inv_id",mst.getMoveinv_id());
+                                param.put("bill_type_scode",IOSEnum.IO_TYPE.code("移库"));
+                                iStIvtStructivtflowService.insetIvtChange(param);
+                                //维护载具
+                                structattrService.update(new UpdateWrapper<StIvtStructattr>().lambda()
+                                        .eq(StIvtStructattr::getStruct_code, dtl.getTurnout_struct_code())
+                                        .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
+                                        .set(StIvtStructattr::getInv_code,"")
+                                        .set(StIvtStructattr::getIs_emptyvehicle,false)
+                                        .set(StIvtStructattr::getStoragevehicle_code, ""));
+                            }
+                        }
+                    }
+
+                    // 解锁仓位
+                    structattrService.update(
+                            new StIvtStructattr()
+                                    .setLock_type(IOSEnum.LOCK_TYPE.code("未锁定"))
+                                    .setInv_id("")
+                                    .setInv_type("")
+                                    .setStoragevehicle_code("")
+                                    .setInv_code(""),
+                            new QueryWrapper<StIvtStructattr>().lambda()
+                                    .eq(StIvtStructattr::getStruct_id, dtls.get(0).getTurnout_struct_id())
+                    );
+
+                    structattrService.update(
+                            new StIvtStructattr()
+                                    .setLock_type(IOSEnum.LOCK_TYPE.code("未锁定"))
+                                    .setInv_id(mst.getMoveinv_id())
+                                    .setInv_type(IOSEnum.IO_TYPE.code("移库"))
+                                    .setStoragevehicle_code(dtls.get(0).getStoragevehicle_code())
+                                    .setInv_code(mst.getBill_code()),
+                            new QueryWrapper<StIvtStructattr>().lambda()
+                                    .eq(StIvtStructattr::getStruct_id, dtls.get(0).getTurnin_struct_id())
+                    );
+
+                    //更新明细
+                    iStIvtMoveinvdtlHrBcpService.update(new UpdateWrapper<StIvtMoveinvdtlHrBcp>()
+                            .set("bill_status", MoveInvEnum.BILL_STATUS.code("完成"))
+                            .in("moveinvdtl_id",dtls.stream().map(StIvtMoveinvdtlHrBcp::getMoveinvdtl_id).collect(Collectors.toList())));
+
+                    //更新主单据
+                    List<StIvtMoveinvdtlHrBcp> list = iStIvtMoveinvdtlHrBcpService.list(new QueryWrapper<StIvtMoveinvdtlHrBcp>()
+                            .eq("moveinv_id", mst.getMoveinv_id())
+                            .ne("bill_status", MoveInvEnum.BILL_STATUS.code("完成"))
+                            .ne("bill_status", MoveInvEnum.BILL_STATUS.code("取消")));
+
+                    if (list.size() == 0) {
+                        this.update(new UpdateWrapper<StIvtMoveinvHrBcp>()
+                                .set("bill_status",MoveInvEnum.BILL_STATUS.code("完成"))
+                                .set("update_time", DateUtil.now())
+                                .set("update_name", SecurityUtils.getCurrentUsername())
+                                .set("update_id",SecurityUtils.getCurrentUserId())
+                                .eq("moveinv_id",mst.getMoveinv_id()));
+                    }
+                }
+
+                // 更新任务
+                taskService.update(
+                        new UpdateWrapper<SchBaseTask>().lambda()
+                                .eq(SchBaseTask::getTask_id, form.getString("task_id"))
+                                .set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
+                );
+                break;
+            case STATUS_CANNEL:
+                //更新明细
+                iStIvtMoveinvdtlHrBcpService.update(new UpdateWrapper<StIvtMoveinvdtlHrBcp>()
+                        .set("bill_status", MoveInvEnum.BILL_STATUS.code("生成"))
+                        .set("task_id","")
+                        .in("moveinvdtl_id",dtls.stream().map(StIvtMoveinvdtlHrBcp::getMoveinvdtl_id).collect(Collectors.toList())));
+
+                // 更新任务
+                taskService.update(
+                        new UpdateWrapper<SchBaseTask>().lambda()
+                                .eq(SchBaseTask::getTask_id, form.getString("task_id"))
+                                .set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode())
+                );
+                break;
+            default:
+        }
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvdtlHrBcpServiceImpl.java

@@ -0,0 +1,108 @@
+package org.nl.wms.storage_manage.semimanagehr.service.moveInv.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.enums.AcsTaskEnum;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.publish.event.PointEvent;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.MapOf;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
+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.MoveInvEnum;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.IStIvtMoveinvdtlHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.StIvtMoveinvdtlHrBcp;
+import org.nl.wms.storage_manage.semimanagehr.service.moveInv.dao.mapper.StIvtMoveinvdtlHrBcpMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 移库单明细表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@Service
+public class StIvtMoveinvdtlHrBcpServiceImpl extends ServiceImpl<StIvtMoveinvdtlHrBcpMapper, StIvtMoveinvdtlHrBcp> implements IStIvtMoveinvdtlHrBcpService {
+
+    @Autowired
+    private ISchBaseTaskService taskService; // 任务服务
+
+    @Autowired
+    private IStIvtMoveinvHrBcpService iStIvtMoveinvHrBcpService; // 主表服务
+
+    @Override
+    public List<Map> listJoinTask(String moveinv_id) {
+        if (StringUtils.isEmpty(moveinv_id)){
+            throw new BadRequestException("移库单主单据id不能为空");
+        }
+        return this.baseMapper.listJoinTask(moveinv_id);
+    }
+
+    @Override
+    @Transactional
+    public void taskOption(JSONObject form, String option) {
+        List<StIvtMoveinvdtlHrBcp> list = this.list(new QueryWrapper<StIvtMoveinvdtlHrBcp>()
+                .eq("moveinv_id", form.getString("moveinv_id"))
+                .eq("turnout_struct_code", form.getString("turnout_struct_code")));
+
+        List<StIvtMoveinvdtlHrBcp> collect = list.stream().filter(a -> a.getBill_status().equals(MoveInvEnum.BILL_STATUS.code("完成"))).collect(Collectors.toList());
+
+        if (!CollectionUtils.isEmpty(collect)){
+            throw new BadRequestException("当前明细存在正在执行的单据");
+        }
+
+        JSONObject param = new JSONObject();
+
+        switch (option){
+
+            case "immediateNotifyAcs":
+                // 下发任务
+                StIvtMoveinvdtlHrBcp moveinvdtlCp = list.get(0);
+                PointEvent event = PointEvent.builder()
+                        .type(AcsTaskEnum.TASK_STRUCT_BCP_HR_MOVE)
+                        .acs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode())
+                        .task_group_id(IdUtil.getStringId())
+                        .point_code1(form.getString("turnout_struct_code"))
+                        .point_code3(form.getString("turnin_struct_code"))
+                        .vehicle_code(form.getString("storagevehicle_code"))
+                        .product_area("A3")
+                        .callback((Consumer<String>) moveinvdtlCp::setTask_id)
+                        .build();
+                BussEventMulticaster.Publish(event);
+
+                // 更新明细
+                this.update(new UpdateWrapper<StIvtMoveinvdtlHrBcp>()
+                        .set("task_id",moveinvdtlCp.getTask_id())
+                        .set("bill_status", MoveInvEnum.BILL_STATUS.code("移库中"))
+                        .eq("moveinv_id", form.getString("moveinv_id")));
+                break;
+            case "forceFinish":
+                param.put("task_id", form.getString("task_id"));
+                param.put("status", "2");
+                iStIvtMoveinvHrBcpService.taskOperate(param);
+                break;
+            case "cancel":
+                param.put("task_id", form.getString("task_id"));
+                param.put("status", "3");
+                iStIvtMoveinvHrBcpService.taskOperate(param);
+                break;
+        }
+
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/IStIvtStructivtHrBcpService.java

@@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.semimanagehr.service.structIvt;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.StIvtStructivtHrBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dto.StructIvtHrBcpQuery;
@@ -29,4 +30,6 @@ public interface IStIvtStructivtHrBcpService extends IService<StIvtStructivtHrBc
     Object getBcpIvt(StructIvtHrBcpQuery query, PageQuery page);
 
     List<Map> getBcpIvtInfo(JSONObject jo);
+
+    Object getBcpMoveIvt(StructIvtYLQuery query, PageQuery page);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.StIvtStructivtHrBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dto.StructIvtHrBcpQuery;
@@ -36,4 +37,6 @@ public interface StIvtStructivtHrBcpMapper extends BaseMapper<StIvtStructivtHrBc
     List<Map> getPdaBcpMaterialIvt(JSONObject jo);
 
     StIvtStructivtBcp queryIvtOutOne(JSONObject json);
+
+    List<Map> getBcpMoveIvt(@Param("query") StructIvtYLQuery query);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml

@@ -242,4 +242,44 @@
         LIMIT 1
     </select>
 
+    <select id="getBcpMoveIvt" resultType="java.util.Map">
+        SELECT
+        ivt.*,
+        mu.unit_name AS qty_unit_name,
+        mb.material_code,
+        mb.material_name,
+        sa.sect_id,
+        sa.sect_code,
+        sa.sect_name,
+        sa.struct_id,
+        sa.struct_code,
+        sa.struct_name,
+        sa.storagevehicle_code,
+        class.class_name
+        FROM
+        st_ivt_structivt_hr_bcp ivt
+        LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
+        LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = ivt.qty_unit_id
+        LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
+        <where>
+            ivt.canuse_qty > 0
+            AND
+            sa.lock_type = '0'
+            <if test="query.material_search != null and query.material_search != ''">
+                and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
+            </if>
+            <if test="query.sect_id != null and query.sect_id != ''">
+                and sa.sect_id = #{query.sect_id}
+            </if>
+            <if test="query.struct_id != null and query.struct_id != ''">
+                and sa.struct_id = #{query.struct_id}
+            </if>
+            and sa.struct_code IN
+            <foreach collection="query.struct_search" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/impl/StIvtStructivtHrBcpServiceImpl.java

@@ -2,9 +2,11 @@ package org.nl.wms.storage_manage.semimanagehr.service.structIvt.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtHrBcpService;
 import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.StIvtStructivtHrBcp;
@@ -59,4 +61,13 @@ public class StIvtStructivtHrBcpServiceImpl extends ServiceImpl<StIvtStructivtHr
     public List<Map> getBcpIvtInfo(JSONObject jo) {
         return this.baseMapper.getBcpIvtInfo(jo);
     }
+
+    @Override
+    public Object getBcpMoveIvt(StructIvtYLQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        List<Map> mst_detail = this.baseMapper.getBcpMoveIvt(query);
+        TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
 }