diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java index a12d153..0f8dc24 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java +++ b/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; + } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java index db8ae84..c421786 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java +++ b/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; + } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index d14cdcd..4799338 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/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(); diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts index 41e2843..a942e99 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts +++ b/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', diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts index 8a43b62..6a8db57 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts @@ -510,6 +510,7 @@ export default { orderstatus:'订单状态', phone:'手机', remark:'备注', + remarks:'备注', contractType:'合约类型', emails:'邮箱', fax:'传真',