订货单：获取历史生产工艺

@@ -1460,3 +1460,5 @@ VALUES('全部', 2, '6', 99, 'order', 'id', NULL, NULL);
 
 
 ALTER TABLE tbl_contract_distributor_standard
 ALTER TABLE tbl_contract_distributor_standard
     ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸+加工合同)';
     ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸+加工合同)';
+
+ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT '生产工艺';

@@ -159,6 +159,12 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
     @ApiModelProperty("是否为试样订单")
     @ApiModelProperty("是否为试样订单")
     private boolean sampleOrder;
     private boolean sampleOrder;
 
 
+    /**
+     * 生产工艺
+     */
+    @ApiModelProperty("生产工艺")
+    private String productionProcess;
+
     public GetPurchaseOrderLineBo() {
     public GetPurchaseOrderLineBo() {
 
 
     }
     }

@@ -541,9 +541,11 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
 
 
     @ApiOperation("获取历史生产工艺")
     @ApiOperation("获取历史生产工艺")
     @GetMapping("/getHistoryProductionProcess")
     @GetMapping("/getHistoryProductionProcess")
-    public InvokeResult<String> getHistoryProductionProcess(@NotBlank(message = "id不能为空") String id) {
-        String productionProcess = purchaseOrderInfoService.getHistoryProductionProcess(id);
-        return InvokeResultBuilder.success(productionProcess);
+    public InvokeResult<GetPurchaseOrderInfoBo> getHistoryProductionProcess(@NotBlank(message = "id不能为空") String id) {
+
+        PurchaseOrderInfo data = purchaseOrderInfoService.getHistoryProductionProcess(id);
+        GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
+        return InvokeResultBuilder.success(result);
     }
     }
 
 
 
 

@@ -275,6 +275,11 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
     /**
     /**
+     * 生产工艺
+     */
+    private String productionProcess;
+
+    /**
      * 新增/删除/变更
      * 新增/删除/变更
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -875,11 +875,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
-    public String getHistoryProductionProcess(String orderId) {
+    public PurchaseOrderInfo getHistoryProductionProcess(String orderId) {
         if (StringUtils.isBlank(orderId)) {
         if (StringUtils.isBlank(orderId)) {
-            return "";
+            throw new DefaultClientException("订货单ID为空！");
         }
         }
-        PurchaseOrderInfo orderInfo = getById(orderId);
+        PurchaseOrderInfo orderInfo = getBaseMapper().findById(orderId);
         if (orderInfo == null) {
         if (orderInfo == null) {
             throw new DefaultClientException("订货单信息不存在！");
             throw new DefaultClientException("订货单信息不存在！");
         }
         }
@@ -887,7 +887,6 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isEmpty(orderLineList)) {
         if (CollectionUtils.isEmpty(orderLineList)) {
             throw new DefaultClientException("订货单物料行数据不存在！");
             throw new DefaultClientException("订货单物料行数据不存在！");
         }
         }
-        List<String> proProcessList = new ArrayList<>();
         String orderingUnit = orderInfo.getOrderingUnit();
         String orderingUnit = orderInfo.getOrderingUnit();
         String workshopId = orderInfo.getWorkshopId();
         String workshopId = orderInfo.getWorkshopId();
         for (PurchaseOrderLine orderLine : orderLineList) {
         for (PurchaseOrderLine orderLine : orderLineList) {
@@ -898,8 +897,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             BigDecimal thicknessTolNeg = orderLine.getThicknessTolNeg();
             BigDecimal thicknessTolNeg = orderLine.getThicknessTolNeg();
             BigDecimal thicknessTolPos = orderLine.getThicknessTolPos();
             BigDecimal thicknessTolPos = orderLine.getThicknessTolPos();
             BigDecimal width = orderLine.getWidth();
             BigDecimal width = orderLine.getWidth();
-            BigDecimal widthTolNeg = orderLine.getWidthTolNeg();
-            BigDecimal widthTolPos = orderLine.getWidthTolPos();
+//            BigDecimal widthTolNeg = orderLine.getWidthTolNeg();
+//            BigDecimal widthTolPos = orderLine.getWidthTolPos();
 
 
             Map<String, Object> params = new HashMap<>();
             Map<String, Object> params = new HashMap<>();
             params.put("orderId", orderId);
             params.put("orderId", orderId);
@@ -912,18 +911,17 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             params.put("thicknessTolNeg", thicknessTolNeg);
             params.put("thicknessTolNeg", thicknessTolNeg);
             params.put("thicknessTolPos", thicknessTolPos);
             params.put("thicknessTolPos", thicknessTolPos);
             params.put("width", width);
             params.put("width", width);
-            params.put("widthTolNeg", widthTolNeg);
-            params.put("widthTolPos", widthTolPos);
+//            params.put("widthTolNeg", widthTolNeg);
+//            params.put("widthTolPos", widthTolPos);
 
 
             String proProcess = getBaseMapper().queryHisProProcess(params);
             String proProcess = getBaseMapper().queryHisProProcess(params);
-            if (StringUtils.isNotBlank(proProcess) && !proProcessList.contains(proProcess)) {
-                proProcessList.add(proProcess);
+            if (StringUtils.isNotBlank(proProcess)) {
+                orderLine.setProductionProcess(proProcess);
             }
             }
         }
         }
-        if (CollectionUtils.isEmpty(proProcessList)) {
-            return "";
-        }
-        return String.join("\n\n", proProcessList);
+        orderInfo.setPurchaseOrderLineList(orderLineList);
+
+        return orderInfo;
     }
     }
 
 
 
 

@@ -173,6 +173,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .set(PurchaseOrderLine::getSampleOrder, vo.isSampleOrder())
                 .set(PurchaseOrderLine::getSampleOrder, vo.isSampleOrder())
+                .set(PurchaseOrderLine::getProductionProcess, vo.getProductionProcess())
                 .eq(PurchaseOrderLine::getId, vo.getId());
                 .eq(PurchaseOrderLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -169,5 +169,5 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param orderId   订货单ID
      * @param orderId   订货单ID
      * @return          String
      * @return          String
      */
      */
-    String getHistoryProductionProcess(String orderId);
+    PurchaseOrderInfo getHistoryProductionProcess(String orderId);
 }
 }

@@ -182,4 +182,10 @@ public class UpdatePurchaseOrderLineVo implements BaseVo, Serializable {
     @ApiModelProperty("是否为试样订单")
     @ApiModelProperty("是否为试样订单")
     private boolean sampleOrder;
     private boolean sampleOrder;
 
 
+    /**
+     * 生产工艺
+     */
+    @ApiModelProperty("生产工艺")
+    private String productionProcess;
+
 }
 }

@@ -293,11 +293,11 @@
     </select>
     </select>
 
 
     <select id="queryHisProProcess" resultType="java.lang.String">
     <select id="queryHisProProcess" resultType="java.lang.String">
-        select o.production_process
+        select ol.production_process
         from purchase_order_info o
         from purchase_order_info o
         inner join tbl_purchase_order_line ol on o.id = ol.purchase_order_id
         inner join tbl_purchase_order_line ol on o.id = ol.purchase_order_id
         where o.ordering_unit = #{params.orderingUnit} and o.workshop_id = #{params.workshopId}
         where o.ordering_unit = #{params.orderingUnit} and o.workshop_id = #{params.workshopId}
-        and o.production_process is not null
+        and ol.production_process is not null
         <choose>
         <choose>
             <when test="params.industry != null and params.industry != ''">
             <when test="params.industry != null and params.industry != ''">
                 and ol.industry = #{params.industry}
                 and ol.industry = #{params.industry}
@@ -354,23 +354,23 @@
                 and ol.width is null
                 and ol.width is null
             </otherwise>
             </otherwise>
         </choose>
         </choose>
-        <choose>
-            <when test="params.widthTolNeg != null">
-                and ol.width_tol_neg = #{params.widthTolNeg}
-            </when>
-            <otherwise>
-                and ol.width_tol_neg is null
-            </otherwise>
-        </choose>
-        <choose>
-            <when test="params.widthTolPos != null">
-                and ol.width_tol_pos = #{params.widthTolPos}
-            </when>
-            <otherwise>
-                and ol.width_tol_pos is null
-            </otherwise>
-        </choose>
-        order by o.update_time desc
+<!--        <choose>-->
+<!--            <when test="params.widthTolNeg != null">-->
+<!--                and ol.width_tol_neg = #{params.widthTolNeg}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and ol.width_tol_neg is null-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+<!--        <choose>-->
+<!--            <when test="params.widthTolPos != null">-->
+<!--                and ol.width_tol_pos = #{params.widthTolPos}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and ol.width_tol_pos is null-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+        order by ol.update_time desc
         limit 1
         limit 1
     </select>
     </select>
 </mapper>
 </mapper>

@@ -28,6 +28,7 @@
         <result column="shipment" property="shipment"/>
         <result column="shipment" property="shipment"/>
         <result column="contract_distributor_line_id" property="contractDistributorLineId"/>
         <result column="contract_distributor_line_id" property="contractDistributorLineId"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="sample_order" property="sampleOrder"/>
+        <result column="production_process" property="productionProcess"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -63,6 +64,7 @@
             tb.shipment,
             tb.shipment,
             tb.contract_distributor_line_id,
             tb.contract_distributor_line_id,
             tb.sample_order,
             tb.sample_order,
+            tb.production_process,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,