Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev

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();
@@ -1013,7 +1015,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         String billno = getNewOrderCode2();
         String contractType = saleOrder.getContractType();
         if (StringUtils.isNotBlank(contractType)) {
-            billno = billno.replace("XXXX-", contractType + "-");
+            billno = billno.replace("XXXX", contractType);
         }
        /* // 优先使用销售订单合同号
         String billno = saleOrder.getContractCode();

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) {