楚江ERP：审核流程厂办改为由code判断

@@ -64,6 +64,12 @@ public class DelayedShipmentDetail extends BaseEntity implements BaseDto {
     private String workshopName;
     private String workshopName;
 
 
     /**
     /**
+     * 所属分厂Code
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
      * 客户ID
      * 客户ID
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -187,6 +187,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     @TableField(exist = false)
     @TableField(exist = false)
     private String workshopName;
     private String workshopName;
 
 
+    /**
+     * 生产厂code(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
 
 
     /**
     /**
      * 客户资信Id
      * 客户资信Id

@@ -246,7 +246,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (StringUtils.isNotEmpty(data.getWorkshopId())) {
         if (StringUtils.isNotEmpty(data.getWorkshopId())) {
             Workshop workshop = workshopService.findById(data.getWorkshopId());
             Workshop workshop = workshopService.findById(data.getWorkshopId());
             if (workshop != null) {
             if (workshop != null) {
-                data.setWorkshopName(workshop.getName());
+                data.setWorkshopCode(workshop.getCode());
             }
             }
         }
         }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);

@@ -163,7 +163,7 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         if (delayedExceedOneDay && !hasAny) {
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
             //开启审核
             DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
-            vo.setWorkshopName(delayedShipmentDetail.getWorkshopName());
+            vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
 
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
         } else {
         } else {
@@ -259,7 +259,7 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         if (delayedExceedOneDay && !hasAny) {
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
             //开启审核
             DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
-            vo.setWorkshopName(delayedShipmentDetail.getWorkshopName());
+            vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
 
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, vo.getId(), BPM_FLAG, vo);
             flowInstanceWrapperService.startInstance(BPM_FLAG, vo.getId(), BPM_FLAG, vo);
         } else {
         } else {

@@ -49,9 +49,9 @@ public class CreateDelayedShipmentVo implements BaseVo, Serializable {
     private List<CreateDelayedShipmentDetailVo> delayedShipmentDetailList;
     private List<CreateDelayedShipmentDetailVo> delayedShipmentDetailList;
 
 
     /**
     /**
-     * 厂办名称
+     * 厂办Code
      */
      */
-    @ApiModelProperty("厂办名称")
-    private String workshopName;
+    @ApiModelProperty("厂办Code")
+    private String workshopCode;
 
 
 }
 }

@@ -57,10 +57,10 @@ public class UpdateDelayedShipmentVo implements BaseVo, Serializable {
     private List<UpdateDelayedShipmentDetailVo> delayedShipmentDetailList;
     private List<UpdateDelayedShipmentDetailVo> delayedShipmentDetailList;
 
 
     /**
     /**
-     * 厂办名称
+     * 厂办Code
      */
      */
-    @ApiModelProperty("厂办名称")
-    private String workshopName;
+    @ApiModelProperty("厂办Code")
+    private String workshopCode;
 
 
 
 
 }
 }

@@ -10,6 +10,7 @@
         <result column="order_type" property="orderType"/>
         <result column="order_type" property="orderType"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_name" property="workshopName"/>
         <result column="workshop_name" property="workshopName"/>
+        <result column="workshop_code" property="workshopCode"/>
         <result column="customer_id" property="customerId"/>
         <result column="customer_id" property="customerId"/>
         <result column="customer_name" property="customerName"/>
         <result column="customer_name" property="customerName"/>
         <result column="shipments_plan_detail_id" property="shipmentsPlanDetailId"/>
         <result column="shipments_plan_detail_id" property="shipmentsPlanDetailId"/>
@@ -41,6 +42,7 @@
                 END AS order_type,
                 END AS order_type,
             o.workshop_id,
             o.workshop_id,
             ws.name AS workshop_name,
             ws.name AS workshop_name,
+            ws.code AS workshop_code,
             o.ordering_unit AS customer_id,
             o.ordering_unit AS customer_id,
             c.name AS customer_name,
             c.name AS customer_name,
             tb.shipments_plan_detail_id,
             tb.shipments_plan_detail_id,