优生产制单备注

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java

@@ -83,4 +83,7 @@ public class ProduceOrderSaveReqVO {
     @Schema(description = "详情")
     private String details;
 
+    @Schema(description = "备注")
+    private String remarks;
+
 }

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java

@@ -121,4 +121,9 @@ public class ProduceOrderDO extends BaseDO {
      */
     private String details;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
 }

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java

@@ -470,7 +470,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 saveReqVO.setProduceDate(LocalDateTime.now());
                 saveReqVO.setInspectionDate(LocalDateTime.now());
                 saveReqVO.setDeliverydate(LocalDateTime.now());
-
+                if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0){
+                    saveReqVO.setRemarks(saleOrderSkuDO.get(0).getRemark());
+                }
                 Double specSizeWidth = productInfo.getSpecSizeWidth();
                 Double specSizeHeight = productInfo.getSpecSizeHeight();
                 String specMaterial = productInfo.getSpecMaterial();

hangtag-ui/hangtag-ui-front/src/locales/en.ts

@@ -515,6 +515,7 @@ export default {
     orderstatus:'orderstatus',
     phone:'phone',
     remark:'remark',
+    remarks:'remarks',
     contractType:'contractType',
     emails:'emails',
     fax:'fax',

hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts

@@ -510,6 +510,7 @@ export default {
     orderstatus:'订单状态',
     phone:'手机',
     remark:'备注',
+    remarks:'备注',
     contractType:'合约类型',
     emails:'邮箱',
     fax:'传真',