update：修改贴标信息

acs/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -17,6 +17,8 @@ import org.nl.wms.das.device.record.service.IDasDeviceErrorRecordService;
 import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord;
 import org.nl.wms.das.inspection.service.IDasQualityInspectionService;
 import org.nl.wms.database.brick.service.IMdBaseBrickInfoService;
+import org.nl.wms.database.customer.service.IMdCsCustomerbaseService;
+import org.nl.wms.database.customer.service.dao.MdCsCustomerbase;
 import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.database.material.service.dao.MdBaseMaterial;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
@@ -130,6 +132,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Autowired
     private YZMapper yzMapper;
 
+    @Autowired
+    private IMdCsCustomerbaseService mdCsCustomerbaseService;
+
     @Autowired
     private IDasDeviceErrorRecordService dasDeviceErrorRecordService;
 
@@ -519,21 +524,28 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 GroupBindMaterialStatusEnum.BOUND.getValue());
         String materialId = groupInfo.getMaterial_id();
         MdBaseMaterial baseMaterial = materialService.getById(materialId);
-        BigDecimal materialWeight = ObjectUtil.isNotEmpty(groupInfo.getMaterial_weight())
-                ? groupInfo.getMaterial_weight() : BigDecimal.valueOf(0);
         String singleWeightStr = baseMaterial.getSingle_weight();
         BigDecimal singleWeight = BigDecimal.valueOf(Double.parseDouble(singleWeightStr));
-        BigDecimal multiply = materialWeight.multiply(singleWeight).multiply(BigDecimal.valueOf(1000));
+        BigDecimal totalWeight = singleWeight.multiply(BigDecimal.valueOf(groupInfo.getMaterial_qty()));
         // 获取工单
         PdmBdWorkorder workorder = workorderService.selectApplyLabelInfo(groupInfo.getWorkorder_code());
+        if (null == workorder){
+            return ApplyTaskResponse.responseError(requestNo, "未查询到工单信息!");
+        }
+        MdCsCustomerbase customerbase = mdCsCustomerbaseService.getById(workorder.getCustomer());
+        if (null == customerbase){
+            return ApplyTaskResponse.responseError(requestNo, "未查询到客户信息!");
+        }
         // 组合
-        sb.append(workorder.getOrder_number()).append("##")
+        sb.append(customerbase.getCust_name()).append("##")
-                .append(workorder.getProduct_code()).append("##")
                 .append(workorder.getMaterial_name()).append("##")
-                .append(workorder.getMaterial_code()).append("##")
                 .append(workorder.getMaterial_spec()).append("##")
+                .append(workorder.getMaterial_code()).append("##")
+                .append(singleWeight).append("##")
+                .append(groupInfo.getMaterial_qty()).append("##")
+                .append(totalWeight).append("##")
+                .append(workorder.getProduct_code()).append("##")
                 .append(workorder.getMaterial_model()).append("##")
-                .append(multiply).append("##")
                 .append(DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyy/MM/dd"));
         return ApplyTaskResponse.responseOk(requestNo, sb.toString());
     }

lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -105,7 +105,7 @@
           <el-form-item label="物料型号" prop="material_model">
             <el-input v-model="form.material_model" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="单重（吨）">
+          <el-form-item label="单重（Kg）">
             <el-input-number
               v-model.number="form.single_weight"
               :min="0"
@@ -218,7 +218,7 @@
         <el-table-column prop="material_code" label="产品牌号 " :min-width="flexWidth('material_code',crud.data,'产品牌号 ')" />
         <el-table-column prop="material_spec" label="产品部位" :min-width="flexWidth('material_spec',crud.data,'产品部位')" />
         <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
-        <el-table-column prop="single_weight" label="单重（吨）" :min-width="flexWidth('single_weight',crud.data,'物料分类标识')" />
+        <el-table-column prop="single_weight" label="单重（kg）" :min-width="flexWidth('single_weight',crud.data,'物料分类标识')" />
         <!-- <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
         <el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" /> -->
         <!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->