添加生产备注字段

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -129,4 +129,8 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
 
     private String productColor;
 
+    /**
+     * 生产备注
+     */
+    private String prodRemark;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -38,4 +38,9 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private Integer isOverdue;
 
+    /**
+     * 生产备注
+     */
+    private String prodRemark;
+
 }

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -23,9 +23,11 @@
 			   po.delivery_period,
 			   po.company_id,
 			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
-			   pod.remark
+			   pod.remark,
+			   c.prod_remark
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
+				 LEFT JOIN contract c ON pod.contract_id = c.id
 			${ew.customSqlSegment}
 	</select>
 </mapper>

hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -14,6 +14,7 @@
 			   po.update_time,
 			   po.company_id,
 			   c.prod_tag,
+			   c.prod_remark,
 			   po.finish_time,
 			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue
 		from production_order po

hx-purchase/src/main/resources/mapper/subscribe/SubscribeDetailMapper.xml

@@ -13,7 +13,8 @@
                       t2.put_warehouse_id      AS putWarehouseId,
                       t2.flow_id,
                       t2.company_id            AS corporationId,
-                      null                     AS prodTag
+                      null                     AS prodTag,
+                      NULL                     AS prodRemark
                FROM subscribe_detail t1
                         LEFT JOIN subscribe t2 ON t1.subscribe_id = t2.id
                    AND t1.data_type = 0
@@ -29,7 +30,8 @@
                       null           AS putWarehouseId,
                       t2.flow_id,
                       null           AS corporationId,
-                      t2.prod_tag    AS prodTag
+                      t2.prod_tag    AS prodTag,
+                      t2.prod_remark AS prodRemark
                FROM subscribe_detail t1
                         LEFT JOIN contract t2 ON t1.contract_id = t2.id
                WHERE t1.data_type = 1)) t2

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -448,4 +448,9 @@ public class Contract extends BasePo {
      */
     private Integer type;
 
+    /**
+     * 生产备注
+     */
+    private String prodRemark;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -2904,6 +2904,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         this.update(q -> q
                 .eq(Contract::getId, dto.getId())
                 .set(Contract::getProdTag, dto.getProdTag())
+                .set(Contract::getProdRemark, dto.getProdRemark())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                 .set(BasePo::getUpdateTime, new Date())
         );