楚江ERP-1、发货单详情增加签收单据文件ID、名称；2、订货单变更列表bug修复；3、发货单录入是发数据后消息通知

@@ -102,6 +102,18 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 签收单据文件ID
+     */
+    @ApiModelProperty("签收单据文件ID")
+    private String fileId;
+
+    /**
+     * 签收单据文件名称
+     */
+    @ApiModelProperty("签收单据文件名称")
+    private String fileName;
+
+    /**
      * 发货明细数据
      * 发货明细数据
      */
      */
     @ApiModelProperty("发货明细数据")
     @ApiModelProperty("发货明细数据")
@@ -149,6 +161,7 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
 
 
     @Override
     @Override
     protected void afterInit(ShipmentsOrderInfo dto) {
     protected void afterInit(ShipmentsOrderInfo dto) {
-
+        this.fileId = dto.getReceiptsId();
+        this.fileName = dto.getReceiptsName();
     }
     }
 }
 }

@@ -184,7 +184,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
      */
      */
     @ApiOperation("明细数据补充录入")
     @ApiOperation("明细数据补充录入")
     @HasPermission({"shipping-plan-manage:shipping-plan:query"})
     @HasPermission({"shipping-plan-manage:shipping-plan:query"})
-    @GetMapping("/dataReplenishInput")
+    @PostMapping("/dataReplenishInput")
     public InvokeResult<Void> dataReplenishInput(@Valid @RequestBody ShipmentsOrderVo vo) {
     public InvokeResult<Void> dataReplenishInput(@Valid @RequestBody ShipmentsOrderVo vo) {
         shipmentsOrderInfoService.dataReplenishInput(vo);
         shipmentsOrderInfoService.dataReplenishInput(vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

@@ -382,7 +382,13 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .eq(OrderInfoChangeRecord::getId, id);
                 .eq(OrderInfoChangeRecord::getId, id);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
         // 消息通知
         // 消息通知
-        messageHandler.sendMsg(record.getCreateById(), Collections.singletonList("jybjhy"), "SPEC_CHANGE_SUBMIT", null);
+        List<String> roleCodes = new ArrayList<>();
+        // 各个分厂经营办计划员
+        roleCodes.add("yfcjybjhy");
+        roleCodes.add("efcjybjhy");
+        roleCodes.add("sfcjybjhy");
+        roleCodes.add("ztfcjybjhy");
+        messageHandler.sendMsg(record.getCreateById(), roleCodes, "SPEC_CHANGE_SUBMIT", null);
     }
     }
 
 
     @Override
     @Override

@@ -23,6 +23,7 @@ import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.handlers.MessageHandler;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -74,6 +75,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private RequestCarTicketService requestCarTicketService;
     private RequestCarTicketService requestCarTicketService;
     @Resource
     @Resource
     private RedisHandler redisHandler;
     private RedisHandler redisHandler;
+    @Resource
+    private MessageHandler messageHandler;
+
 
 
 
 
     @Override
     @Override
@@ -309,6 +313,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         if (CollectionUtils.isEmpty(shipmentsOrderDetailList)) {
         if (CollectionUtils.isEmpty(shipmentsOrderDetailList)) {
             throw new DefaultClientException("发货单明细不存在！");
             throw new DefaultClientException("发货单明细不存在！");
         }
         }
+        List<String> orderIds = new ArrayList<>();
         List<String> partShipmentsOrderIds = new ArrayList<>();
         List<String> partShipmentsOrderIds = new ArrayList<>();
         List<String> shipmentsOrderIds = new ArrayList<>();
         List<String> shipmentsOrderIds = new ArrayList<>();
         List<ShipmentsPlanDetail> dataList = new ArrayList<>();
         List<ShipmentsPlanDetail> dataList = new ArrayList<>();
@@ -333,6 +338,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 partShipmentsOrderIds.add(info.getOrderId());
                 partShipmentsOrderIds.add(info.getOrderId());
             }
             }
             dataList.add(detail);
             dataList.add(detail);
+            if (!orderIds.contains(info.getOrderId())) {
+                orderIds.add(detail.getOrderId());
+            }
         }
         }
         // 更新发货明细
         // 更新发货明细
         shipmentsPlanDetailService.updateBatchById(dataList);
         shipmentsPlanDetailService.updateBatchById(dataList);
@@ -341,6 +349,27 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         // 更新订货单状态
         // 更新订货单状态
         purchaseOrderInfoService.updateStatus(shipmentsOrderIds, "SHIPPED");
         purchaseOrderInfoService.updateStatus(shipmentsOrderIds, "SHIPPED");
         purchaseOrderInfoService.updateStatus(partShipmentsOrderIds, "TRANSIT");
         purchaseOrderInfoService.updateStatus(partShipmentsOrderIds, "TRANSIT");
+        // 消息通知
+        String type = vo.getType();
+        List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+        if (CollectionUtils.isNotEmpty(orderInfoList)) {
+            List<String> userIds = new ArrayList<>();
+            StringBuilder orderNoBuilder = new StringBuilder();
+            for (PurchaseOrderInfo info : orderInfoList) {
+                userIds.add(info.getContractCreateById());
+                orderNoBuilder.append(info.getOrderNo()).append("、");
+            }
+            if (orderNoBuilder.length() > 0) {
+                orderNoBuilder.setLength(orderNoBuilder.length() - 1);
+            }
+            String title = "订货单：" + orderNoBuilder + "，";
+            if ("ALL".equals(type)) {
+                title += "已全部发货！";
+            } else if ("PART".equals(type)) {
+                title += "已部分发货！";
+            }
+            messageHandler.sendMsg(userIds, title, "", "", null);
+        }
     }
     }
 
 
     @Override
     @Override

@@ -22,6 +22,15 @@ public class ShipmentsOrderVo implements BaseVo, Serializable {
     @NotBlank(message = "id不能为空！")
     @NotBlank(message = "id不能为空！")
     private String id;
     private String id;
 
 
+    /**
+     * 类型
+     * ALL：全部发货
+     * PART：部分发货
+     */
+    @ApiModelProperty(value = "type", required = true)
+    @NotBlank(message = "类型不能为空！")
+    private String type;
+
 
 
     @ApiModelProperty(value = "发货单明细")
     @ApiModelProperty(value = "发货单明细")
     @NotEmpty(message = "发货单明细不能为空！")
     @NotEmpty(message = "发货单明细不能为空！")

@@ -75,6 +75,7 @@
             tb.customer_credit_id,
             tb.customer_credit_id,
             cc.company_suggested_category AS customer_tier,
             cc.company_suggested_category AS customer_tier,
             tb.total_quantity,
             tb.total_quantity,
+            tb.output,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,