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 d9e9943..7bc1e0a 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 @@ -473,8 +473,10 @@ 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()); + if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && "尺码唛".equals(productInfo.getProductTypeName())){ + SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0); + String remarks = skuDo.getOrderQty() + " " + skuDo.getLabelSize(); + saveReqVO.setRemarks(remarks); } Double specSizeWidth = productInfo.getSpecSizeWidth(); Double specSizeHeight = productInfo.getSpecSizeHeight(); diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue index 37ab719..92c1419 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue @@ -302,7 +302,7 @@ const resetForm = () => { formRef.value?.resetFields() } - +// 下载 const downpdf = async () => { const id = formData.value.id; if (id) { @@ -345,6 +345,7 @@ const downpdf = async () => { } +// 预览 const preview = async () => { const id = formData.value.id; if (id) {