楚江ERP-发货单相关接口调试

@@ -6,6 +6,9 @@ import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
+
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
 import lombok.Data;
 import lombok.Data;
@@ -99,6 +102,12 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 发货明细数据
+     */
+    @ApiModelProperty("发货明细数据")
+    private List<ShipmentsPlanDetail> detailList;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @ApiModelProperty("创建人ID")
     @ApiModelProperty("创建人ID")

@@ -378,12 +378,12 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         roleCodeList.add("scktjy");
         roleCodeList.add("scktjy");
         // 运作科主管
         // 运作科主管
         roleCodeList.add("yzkzg");
         roleCodeList.add("yzkzg");
+        // 市场科主管
+        roleCodeList.add("sckzg");
         // 获取厂房信息
         // 获取厂房信息
         Workshop workshop = workshopService.findById(plan.getWorkshopId());
         Workshop workshop = workshopService.findById(plan.getWorkshopId());
         String workshopName = workshop.getName();
         String workshopName = workshop.getName();
         if ("一分厂".equals(workshopName)) {
         if ("一分厂".equals(workshopName)) {
-            // 市场科主管
-            roleCodeList.add("yfcsckzg");
             // 经营办主管
             // 经营办主管
             roleCodeList.add("yfcjybzg");
             roleCodeList.add("yfcjybzg");
             // 生产经理
             // 生产经理
@@ -391,8 +391,6 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             // 品质经理
             // 品质经理
             roleCodeList.add("yfcpzjl");
             roleCodeList.add("yfcpzjl");
         } else if ("二分厂".equals(workshopName)) {
         } else if ("二分厂".equals(workshopName)) {
-            // 市场科主管
-            roleCodeList.add("efcsckzg");
             // 经营办主管
             // 经营办主管
             roleCodeList.add("efcjybzg");
             roleCodeList.add("efcjybzg");
             // 生产经理
             // 生产经理
@@ -400,8 +398,6 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             // 品质经理
             // 品质经理
             roleCodeList.add("efcpzjl");
             roleCodeList.add("efcpzjl");
         } else if ("三分厂".equals(workshopName)) {
         } else if ("三分厂".equals(workshopName)) {
-            // 市场科主管
-            roleCodeList.add("sfcsckzg");
             // 经营办主管
             // 经营办主管
             roleCodeList.add("sfcjybzg");
             roleCodeList.add("sfcjybzg");
             // 生产经理
             // 生产经理
@@ -409,8 +405,6 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             // 品质经理
             // 品质经理
             roleCodeList.add("sfcpzjl");
             roleCodeList.add("sfcpzjl");
         } else if ("四分厂".equals(workshopName) || "紫铜厂".equals(workshopName)) {
         } else if ("四分厂".equals(workshopName) || "紫铜厂".equals(workshopName)) {
-            // 市场科主管
-            roleCodeList.add("ztcsckzg");
             // 经营办主管
             // 经营办主管
             roleCodeList.add("ztcjybzg");
             roleCodeList.add("ztcjybzg");
             // 生产经理
             // 生产经理

@@ -407,22 +407,24 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     , (v1, v2) -> v2));
                     , (v1, v2) -> v2));
         }
         }
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
-            String status = orderInfo.getStatus();
-            if ("ISSUED".equals(status)) {
+            DraftRequestCarTicket draftTicket = draftTicketMap.get(orderInfo.getId());
+            if (draftTicket == null) {
                 // 生成草稿要车单
                 // 生成草稿要车单
                 CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate());
                 CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate());
                 draftRequestCarTicketService.create(createVo);
                 draftRequestCarTicketService.create(createVo);
-            } else {
+                break;
+            }
+            if ("PASS".equals(draftTicket.getStatus())) {
                 // 生成要车计划
                 // 生成要车计划
                 CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
                 CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
                 planCreateVo.setRequestCarDate(LocalDate.now());
                 planCreateVo.setRequestCarDate(LocalDate.now());
                 planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
                 planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
                 String requestCarPlanId = carRequestPlanService.create(planCreateVo);
                 String requestCarPlanId = carRequestPlanService.create(planCreateVo);
                 // 生成要车单
                 // 生成要车单
-                DraftRequestCarTicket draftTicket = draftTicketMap.get(orderInfo.getId());
-                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId, draftTicket == null
-                        ? null : draftTicket.getId(), plan.getTomoPreShipDate());
+                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId, draftTicket.getId(), plan.getTomoPreShipDate());
                 requestCarTicketService.create(ticketCreateVo);
                 requestCarTicketService.create(ticketCreateVo);
+            } else {
+                throw new DefaultClientException("请先补充草稿要车单数据！");
             }
             }
         }
         }
     }
     }

@@ -14,6 +14,12 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
+     * 购货单位名称
+     */
+    @ApiModelProperty("购货单位名称")
+    private String customerName;
+
+    /**
      * 厂房ID
      * 厂房ID
      */
      */
     @ApiModelProperty("厂房ID")
     @ApiModelProperty("厂房ID")
@@ -24,7 +30,8 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
      */
      */
     @ApiModelProperty("发货日期")
     @ApiModelProperty("发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
     @TypeMismatch(message = "发货日期格式有误！")
-    private LocalDate shipmentsDate;
+    private LocalDate shipmentsDateStart;
+    private LocalDate shipmentsDateEnd;
 
 
     /**
     /**
      * 办事处ID
      * 办事处ID
@@ -33,6 +40,12 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 状态
      * 状态
      */
      */
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")

@@ -27,6 +27,7 @@
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="examine_status" property="examineStatus"/>
         <result column="examine_status" property="examineStatus"/>
         <result column="revoke_status" property="revokeStatus"/>
         <result column="revoke_status" property="revokeStatus"/>
+        <result column="spec_change_status" property="specChangeStatus"/>
         <result column="production_process" property="productionProcess"/>
         <result column="production_process" property="productionProcess"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
         <result column="dept_name" property="deptName"/>
@@ -73,6 +74,7 @@
             tb.status,
             tb.status,
             tb.examine_status,
             tb.examine_status,
             tb.revoke_status,
             tb.revoke_status,
+            tb.spec_change_status,
             tb.production_process,
             tb.production_process,
             tb.dept_id,
             tb.dept_id,
             sd.name AS dept_name,
             sd.name AS dept_name,

@@ -50,8 +50,11 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
-            <if test="vo.shipmentsDate != null">
-                AND tb.shipments_date = #{vo.shipmentsDate}
+            <if test="vo.shipmentsDateStart != null">
+                AND tb.shipments_date >= #{vo.shipmentsDateStart}
+            </if>
+            <if test="vo.shipmentsDateEnd != null">
+                AND tb.shipments_date &lt;= #{vo.shipmentsDateEnd}
             </if>
             </if>
             <if test="vo.deptId != null and vo.deptId != ''">
             <if test="vo.deptId != null and vo.deptId != ''">
                 AND tb.dept_id = #{vo.deptId}
                 AND tb.dept_id = #{vo.deptId}
@@ -59,6 +62,9 @@
             <if test="vo.status != null and vo.status != ''">
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
                 AND tb.status = #{vo.status}
             </if>
             </if>
+            <if test="vo.customerName != null and vo.customerName != ''">
+                AND c.name like concat('%', #{vo.customerName}, '%')
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 

@@ -138,7 +138,10 @@
         from tbl_purchase_order_line ol
         from tbl_purchase_order_line ol
         inner join purchase_order_info o on ol.purchase_order_id = o.id
         inner join purchase_order_info o on ol.purchase_order_id = o.id
         left join base_data_customer c on o.ordering_unit = c.id
         left join base_data_customer c on o.ordering_unit = c.id
-        where ol.delivery_date >= #{vo.shipmentDate}
+        where ol.delivery_date >= #{vo.shipmentDate} and ol.del_flag = false
+        and o.type = 'PRODUCTION' and o.examine_status = 'PASS' and o.status not in ('SHIPPED', 'DELIVERED')
+        and (o.revoke_status != 'UNDOING' or o.revoke_status is null)
+        and (o.spec_change_status != 'IN_PROGRESS' or o.spec_change_status is null)
         <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
         <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
             and ol.id not in
             and ol.id not in
             <foreach collection="vo.orderSpecIds" open="(" separator="," close=")" item="item">
             <foreach collection="vo.orderSpecIds" open="(" separator="," close=")" item="item">
@@ -201,6 +204,7 @@
             pd.*,
             pd.*,
             c.id as customer_id
             c.id as customer_id
         from shipments_plan_detail pd
         from shipments_plan_detail pd
+        inner join shipments_plan p on pd.plan_id = p.id and pd.shipments_date = p.tomo_pre_ship_date
         left join purchase_order_info o on pd.order_id = o.id
         left join purchase_order_info o on pd.order_id = o.id
         left join base_data_customer c on o.ordering_unit = c.id
         left join base_data_customer c on o.ordering_unit = c.id
         where pd.del_flag = false
         where pd.del_flag = false