加工默认一个批次号

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java

@@ -194,6 +194,7 @@ public class ProductWarehouseController {
             entity.setProductTypeId(entity.getProductTypeIds());
             entity.setInventoryUnitId(entity.getInventoryUnitIds());
             entity.setProportionNum("0");
+            entity.setBatchNumber("JG24000PZ");
             Map<String, Object> productWarehouseMap=JsonUtil.entityToMap(entity);
             productWarehouseMap.put("id", productWarehouseMap.get("id"));
             //副表数据

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java

@@ -479,7 +479,8 @@ public class WorkOrderController {
                                 warehousingStorageProductModel.setDepartmentId( entity.getDepartmentId());
                                 warehousingStorageProductModel.setCreatorUserId( entity.getCreatorUserId());
                                 //入库新增一个批次号
-                                warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
+//                                warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
+                                warehousingStorageProductModel.setBatchNumber(workOrderProductModel.getBatchNumber()); //成品批次
                                 list.add(warehousingStorageProductModel);
                                 warehousingStorageForm.setWarehousingStorageProductList(list);
                             }
@@ -513,7 +514,8 @@ public class WorkOrderController {
                                     inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
                                     inventoryEntity.setWarehouseId(entity.getWarehouseId());
                                     inventoryEntity.setStorageAreaId(warehousingStorageProductModel.getStorageAreaId());
-                                    inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber());
+//                                    inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber());
+                                    inventoryEntity.setBatchNumber(workOrderForm.getWorkOrderProductList().get(0).getBatchNumber()); //成品批次
 
                                     inventoryEntity.setCompanyId( entity.getCompanyId());
                                     inventoryEntity.setOrganizeJsonId(entity.getOrganizeJsonId());

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java

@@ -70,6 +70,10 @@ public class WorkOrderProductEntity  {
     @TableField(value = "BAR_CODE" , updateStrategy = FieldStrategy.IGNORED)
     private String barCode;
 
+    /** 批次号 **/
+    @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String batchNumber;
+
     @TableField(exist = false)
     private BigDecimal nums;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java

@@ -61,4 +61,8 @@ public class WorkOrderProductModel  {
     @JsonProperty("creatorUserId")
     private String creatorUserId;
 
+    /** 批次号 **/
+    @JSONField(name = "batchNumber")
+    private String batchNumber;
+
 }

jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue

@@ -376,6 +376,20 @@
                   </template>
                 </el-table-column>
 
+                <el-table-column label="成品批次号" v-if="judgeShow('workorderproduct-batchNumber')"
+                  width="180px" prop="batchNumber">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-batchNumber')">*</span>成品批次号
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.batchNumber"
+                      @change="changeData('workorderproduct-cost', scope.$index)" placeholder="请输入"
+                      disabled clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+
                 <el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')"
                   align="center" prop="remark" width="200px">
 
@@ -760,6 +774,7 @@ export default {
           unitId: '',
           unitIdOptions: [],
           proportionNum: 0,
+          batchNumber: 'JG24000PZ',
           planNum: '',
           proportionNumOptions: [],
           bomId: '',
@@ -1315,6 +1330,7 @@ export default {
         remark: undefined,
         spec: undefined,
         barCode: undefined,
+        batchNumber: 'JG24000PZ',
         inventoryUnitId: undefined,
         productTypeId: undefined,
       }