仓码pda改造;

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java

@@ -116,6 +116,12 @@ public class WarehouseFeignPO extends BaseVOEntity{
     @Excel(name = "是否作废: 1-否 2-是")
     private Integer nullify;
 
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
 
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java

@@ -122,5 +122,12 @@ public class Warehouse extends BaseVOEntity{
     @Excel(name = "是否启用: 1-否 2-是")
     private Integer isEnable;
 
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
+
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java

@@ -124,5 +124,11 @@ public class WarehousePO extends BaseVOEntity{
     private Integer isEnable;
     @ApiModelProperty("库区集合")
     private List<StorageSectionPO> storageSectionList;
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
 
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java

@@ -131,4 +131,12 @@ public class WarehouseDO extends BaseVOEntity{
     private String orgIds;
     @ApiModelProperty("组织id 集合")
     private List<Long> orgIdList;
+
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
+
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java

@@ -136,4 +136,12 @@ public class WarehouseDTO extends BaseVOEntity{
     private String orgIds;
     @ApiModelProperty("组织id 集合")
     private List<Long> orgIdList;
+
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
+
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
 }

mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml

@@ -37,11 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="isEnable"    column="IS_ENABLE"    />
+        <result property="workMode"    column="WORK_MODE"    />
+        <result property="taskMode"    column="TASK_MODE"    />
     </resultMap>
 
 
     <sql id="selectWarehousePo">
-        select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name, warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, IS_ENABLE from warehouse
+        select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name,
+               warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name,
+               director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region,
+               usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by,
+               update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE
+        from warehouse
     </sql>
 
     <sql id="selectWarehousePo1">

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -45,6 +45,7 @@ import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAcc
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
+import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
 import com.mhd.wms.domain.stockInOrder.repository.vo.GwInDetail;
@@ -119,6 +120,8 @@ public class StockInOrderApplicationService {
     @Autowired
     private StockOutOrderMapper stockOutOrderMapper;
     @Autowired
+    private StockInOrderMapper stockInOrderMapper;
+    @Autowired
     private PickingMaterialDetailMapper pickingMaterialDetailMapper;
     private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData";
     private static final String API_NAME = "save_order_i";
@@ -563,6 +566,9 @@ public class StockInOrderApplicationService {
 
 
     public void omsOrderAdd(StockInOrder stockInOrder){
+        // 设置任务下发用户ID
+        String userId = stockInOrderMapper.queryWarehouseUserId(stockInOrder.getOrganizationId(), stockInOrder.getWarehouseId(), stockInOrder.getTopOrganizationId());
+        stockInOrder.setTaskIssueUserId(userId);
         stockInOrderDomainService.omsOrderAdd(stockInOrder);
     }
 
@@ -1796,6 +1802,9 @@ public class StockInOrderApplicationService {
                 // 设置数据字典键值
                 setDataDict(order);
 
+                // 设置任务下发用户ID
+                String userId = stockInOrderMapper.queryWarehouseUserId(order.getOrganizationId(), order.getWarehouseId(), order.getTopOrganizationId());
+                order.setTaskIssueUserId(userId);
                 orderList.add(order);
             }
 
@@ -1915,6 +1924,10 @@ public class StockInOrderApplicationService {
         if (stockInOrderDO.getWarehouseId() == null) {
             throw new ServiceException("仓库ID不能为空");
         }
+
+        //任务下发用户ID
+        String userIds = stockInOrderMapper.queryWarehouseUserId(stockInOrderDO.getOrganizationId(), stockInOrderDO.getWarehouseId(), stockInOrderDO.getTopOrganizationId());
+        stockInOrderDO.setTaskIssueUserId(userIds);
         AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(stockInOrderDO.getWarehouseId());
         if (ajaxResult == null) {
             throw new ServiceException("获取仓库信息失败：返回结果为空，仓库ID：" + stockInOrderDO.getWarehouseId());

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -50,6 +50,7 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDet
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
 import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService;
+import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
@@ -117,6 +118,8 @@ public class StockOutOrderApplicationService {
     @Autowired
     private StockOutOrderMapper stockOutOrderMapper;
     @Autowired
+    private StockInOrderMapper stockInOrderMapper;
+    @Autowired
     private PickingMaterialDetailMapper pickingMaterialDetailMapper;
     private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData";
     private static final String API_NAME = "save_order_e";
@@ -294,14 +297,20 @@ public class StockOutOrderApplicationService {
      */
     public Boolean insert(StockOutOrderDO stockOutOrderDO) {
         //设置仓库
-        //setWarehouseInfo(stockOutOrderDO);
+        setWarehouseInfo(stockOutOrderDO);
         //设置货主信息
         shipperParam(stockOutOrderDO);
         //设置客户信息
         customerParam(stockOutOrderDO);
+        if (stockOutOrderDO.getOrderTypeCode() == null) {
             stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        }
+        if (stockOutOrderDO.getBusinessType() == null) {
             stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
+        }
+        if (stockOutOrderDO.getOrderTypeName() == null) {
             stockOutOrderDO.setOrderTypeName("普通出库");
+        }
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
         return stockOutOrderDomainService.insert(stockOutOrderDO);
@@ -311,6 +320,8 @@ public class StockOutOrderApplicationService {
      * 修改出库单
      */
     public Boolean update(StockOutOrderDO stockOutOrderDO) {
+        //设置仓库
+        setWarehouseInfo(stockOutOrderDO);
         return stockOutOrderDomainService.update(stockOutOrderDO);
     }
 
@@ -1354,6 +1365,9 @@ public class StockOutOrderApplicationService {
         if (stockOutOrderDO.getWarehouseId() == null) {
             throw new ServiceException("仓库ID不能为空");
         }
+        // 获取任务下发用户ID
+        String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrderDO.getOrganizationId(), stockOutOrderDO.getWarehouseId(), stockOutOrderDO.getTopOrganizationId());
+        stockOutOrderDO.setTaskIssueUserId(userId);
         AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(stockOutOrderDO.getWarehouseId());
         if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
             throw new ServiceException("获取仓库信息失败");

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java

@@ -30,4 +30,6 @@ public interface StockInOrderMapper extends BaseMapper<StockInOrder>
     List<InMaterialDetailPO> queryNoticePrintDetail(StockInOrderDO stockInOrderDO);
 
     StockInOrderPO selectByInOrderNumber(@Param("inOrderNumber") String inOrderNumber);
+
+    String queryWarehouseUserId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId, @Param("topOrganizationId") Long topOrganizationId);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java

@@ -424,4 +424,13 @@ public class StockOutOrder extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java

@@ -25,6 +25,7 @@ import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMap
 import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
+import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
@@ -61,6 +62,8 @@ public class ExcelParseService {
     private StockOutOrderDomainService stockOutOrderDomainService;
     @Autowired
     private StockOutOrderMapper stockOutOrderMapper;
+    @Autowired
+    private StockInOrderMapper stockInOrderMapper;
     @Resource
     private UserServiceFeign userServiceFeign;
     /**
@@ -114,6 +117,7 @@ public class ExcelParseService {
         stockOutOrder.setWarehouseName(warehouseName);
         stockOutOrder.setWarehouseCode(warehouseCode);
         stockOutOrder.setWarehouseId(warehouseId);
+
         stockOutOrder.setSalesmanId(String.valueOf(loginUser.getUserPo().getUserId()));
         stockOutOrder.setSalesmanName(loginUser.getUserPo().getUserName());
         String settlementCurrency = stockOutOrderMapper.getSettlementCurrency(shipperId);
@@ -124,6 +128,9 @@ public class ExcelParseService {
             stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         }
+        // 获取任务下发用户ID
+        String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrder.getOrganizationId(), stockOutOrder.getWarehouseId(), stockOutOrder.getTopOrganizationId());
+        stockOutOrder.setTaskIssueUserId(userId);
         initParam(stockOutOrder);
         // 导入出库单时，如果出库单类型为空，默认设置为普通出库
         if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) {

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -451,4 +451,12 @@ public class StockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("推送人姓名")
     private String pushByName;
     private String khdm;
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -492,4 +492,19 @@ public class StockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeTo;
+
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
+
+    //仓码pda查询参数
+    @ApiModelProperty("pda查询用户ID")
+    private Long queryUserId;
+    @ApiModelProperty("状态列表")
+    private List<Integer> statusList;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -70,6 +70,7 @@ import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNotic
 import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService;
 import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
+import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
 import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
@@ -149,6 +150,8 @@ public class StockOutOrderDomainService {
     private IPickingMaterialDetailService pickingMaterialDetailService;
     @Autowired
     private IPickingOrderService pickingOrderService;
+    @Autowired
+    private StockInOrderMapper stockInOrderMapper;
     /**
      * 分页查询出库单列表
      */
@@ -1986,6 +1989,9 @@ public class StockOutOrderDomainService {
     private static final String OMS_AUTO_AUDIT_REMARK = "OMS下发自动审核";
 
     public void omsOrderAdd(StockOutOrder stockOutOrder) {
+        // 任务下发用户id
+        String userId = stockInOrderMapper.queryWarehouseUserId(stockOutOrder.getOrganizationId(), stockOutOrder.getWarehouseId(), stockOutOrder.getTopOrganizationId());
+        stockOutOrder.setTaskIssueUserId(userId);
         stockOutOrderService.save(stockOutOrder);
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -484,4 +484,18 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeTo;
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
+
+    //仓码pda查询参数
+    @ApiModelProperty("pda查询用户ID")
+    private Long queryUserId;
+    @ApiModelProperty("状态列表")
+    private List<Integer> statusList;
 }

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -101,6 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pushByName"    column="PUSH_BY_NAME"    />
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
+        <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -134,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
-        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no
+        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -585,4 +588,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND in_order_number = #{inOrderNumber}
     </select>
 
+    <select id="queryWarehouseUserId" resultMap="java.lang.String" resultType="java.lang.String">
+        SELECT WM_CONCAT(CORRELATION_ID) AS userIds
+        FROM ASSOCIATION_WAREHOUSE
+        WHERE warehouse_id = #{warehouseId} AND del_flag = 1 AND organization_id = #{organizationId} AND top_organization_id = #{topOrganizationId}
+    </select>
+
 </mapper>

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -100,6 +100,9 @@
         <result property="pushByName"    column="PUSH_BY_NAME"    />
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
+        <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
 
 
@@ -120,7 +123,7 @@
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY,
-        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY
+        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID
     </sql>
 
 
@@ -170,6 +173,15 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="statusList != null and statusList.size > 0 ">
+            and a.status in
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryUserId != null">
+            and a.TASK_ISSUE_USER_ID like concat('%', #{queryUserId}, '%')
+        </if>
         <!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 -->
         <if test="gtStatus != null ">
             and a.status &gt; #{gtStatus}