加工修改，添加重量，添加查询

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -275,6 +275,12 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
                 voucherQueryWrapper.like("d.net_weight",value);
             }
 
+            if(ObjectUtil.isNotEmpty(voucherPagination.getCreatorUserName())){
+                voucherNum++;
+                String value = String.valueOf(voucherPagination.getCreatorUserName());
+                voucherQueryWrapper.like("i.f_real_name",value);
+            }
+
             if(ObjectUtil.isNotEmpty(voucherPagination.getVoucherCode())){
             voucherNum++;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java

@@ -518,9 +518,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         }
         if (workOrderForm.getWorkOrderProductList()!=null){
             List<WorkOrderProductEntity> tableField116 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderProductList(),WorkOrderProductEntity.class);
-            List<WorkOrderProductEntity> tableField1161 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderProductList1(),WorkOrderProductEntity.class);
-
-            tableField116.addAll(tableField1161);
 
             for(WorkOrderProductEntity entitys : tableField116){
                 entitys.setId(RandomUtil.uuId());
@@ -539,6 +536,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         }
         if (workOrderForm.getWorkOrderPrimaryList()!=null){
             List<WorkOrderPrimaryEntity> tableField126 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderPrimaryList(),WorkOrderPrimaryEntity.class);
+            List<WorkOrderPrimaryEntity> tableField1261 = JsonUtil.getJsonToList(workOrderForm.getWorkOrderPrimaryList1(),WorkOrderPrimaryEntity.class);
+            if (tableField1261!=null && tableField1261.size()>0){
+                tableField126.addAll(tableField1261);
+            }
             for(WorkOrderPrimaryEntity entitys : tableField126){
                 entitys.setId(RandomUtil.uuId());
                 entitys.setWorkId(entity.getId());
@@ -619,7 +620,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
     @Override
     public List<ProductWarehouseEntity> getWorkBomProduct1(String id, QueryWrapper<WorkOrderEntity> workOrderQueryWrapper) {
-        return workOrderMapper.queryworkOrderBomProduct(id,workOrderQueryWrapper);
+        return workOrderMapper.queryworkOrderBomProduct1(id,workOrderQueryWrapper);
     }
 
     @Override

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

@@ -562,6 +562,111 @@ public class WorkOrderController {
                                 inventoryLogService.saveOrUpdate(inventoryLogEntity);
                             }
 
+
+                            if (workOrderForm.getWorkOrderPrimaryList1()!=null && workOrderForm.getWorkOrderPrimaryList1().size()>0){
+                                //副产品生成入库单
+                                WarehousingStorageForm warehousingStorageForm1=new WarehousingStorageForm();
+                                warehousingStorageForm1.setWarehousingStorageType("9");
+                                warehousingStorageForm1.setWarehousingStorageStatus("3");
+                                warehousingStorageForm1.setWarehousingId(workOrderForm.getId());
+                                warehousingStorageForm1.setWarehouseId(workOrderForm.getWarehouseId());
+
+                                List<WarehousingStorageProductModel> PrimaryList1 =new ArrayList<>();
+                                for (WorkOrderPrimaryModel workOrderPrimaryModel:workOrderForm.getWorkOrderPrimaryList1()){
+                                    WarehousingStorageProductModel warehousingStorageProductModel=new WarehousingStorageProductModel();
+                                    warehousingStorageProductModel.setProductId(workOrderPrimaryModel.getProductId());
+                                    warehousingStorageProductModel.setStorageAreaId(workOrderPrimaryModel.getCargoId());
+                                    warehousingStorageProductModel.setStorageUnit(workOrderPrimaryModel.getInventoryUnitId()); //加工单位
+                                    warehousingStorageProductModel.setStorageNumber(workOrderPrimaryModel.getRealityNum());  //加工数量
+                                    warehousingStorageProductModel.setSpec(workOrderPrimaryModel.getSpec());
+                                    warehousingStorageProductModel.setInventoryUnitId(workOrderPrimaryModel.getInventoryUnitId());
+
+                                    //入库新增一个批次号
+//                                warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
+                                    warehousingStorageProductModel.setBatchNumber(workOrderPrimaryModel.getBatchNumber()); //成品批次
+                                    PrimaryList1.add(warehousingStorageProductModel);
+                                    warehousingStorageForm1.setWarehousingStorageProductList(PrimaryList1);
+                                }
+                                warehousingStorageController.createWork(id,warehousingStorageForm1);
+
+                                //副产品入库单生成流水
+                                //审核通过
+                                for (WarehousingStorageProductModel warehousingStorageProductModel1 : warehousingStorageForm1.getWarehousingStorageProductList()) {
+                                    ProductWarehouseEntity productWarehouseEntity = null;
+                                    if(StringUtil.isNotEmpty(warehousingStorageProductModel1.getProductId())){
+                                        productWarehouseEntity = productWarehouseService.getById(warehousingStorageProductModel1.getProductId());
+                                    }
+                                    //更新库存
+                                    //根据商品id和批次号查询库存信息
+                                    QueryWrapper<InventoryEntity> inventoryQueryWrapper = new QueryWrapper<>();
+                                    inventoryQueryWrapper.lambda().eq(InventoryEntity::getProductId, warehousingStorageProductModel1.getProductId());
+                                    inventoryQueryWrapper.lambda().eq(InventoryEntity::getBatchNumber, warehousingStorageProductModel1.getBatchNumber());
+                                    List<InventoryEntity> inventoryList = inventoryService.list(inventoryQueryWrapper);
+                                    InventoryEntity inventoryEntity = new InventoryEntity();
+                                    if(inventoryList != null && inventoryList.size() > 0){
+                                        inventoryEntity = inventoryList.get(0);
+                                        inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add(new BigDecimal(warehousingStorageProductModel1.getStorageNumber())));//库存数量
+                                    }else{
+                                        inventoryEntity.setProductId(warehousingStorageProductModel1.getProductId());
+                                        inventoryEntity.setCode(productWarehouseEntity.getCode());
+                                        inventoryEntity.setName(productWarehouseEntity.getName());
+                                        inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
+                                        inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());
+                                        inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());
+                                        inventoryEntity.setSpec(productWarehouseEntity.getSpec());
+                                        inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
+                                        inventoryEntity.setWarehouseId(entity.getWarehouseId());
+                                        inventoryEntity.setStorageAreaId(warehousingStorageProductModel1.getStorageAreaId());
+//                                    inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber());
+                                        inventoryEntity.setBatchNumber(workOrderForm.getWorkOrderPrimaryList1().get(0).getBatchNumber()); //批次
+
+                                        inventoryEntity.setCompanyId( entity.getCompanyId());
+                                        inventoryEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
+                                        inventoryEntity.setDepartmentId( entity.getDepartmentId());
+                                        inventoryEntity.setCreatorUserId( entity.getCreatorUserId());
+                                        inventoryEntity.setInventoryNumber(new BigDecimal(warehousingStorageProductModel1.getStorageNumber()));//库存数量
+                                    }
+                                    inventoryService.saveOrUpdate(inventoryEntity);
+
+                                    QueryWrapper<WarehousingStorageEntity> storageEntityQueryWrapper = new QueryWrapper<>();
+                                    storageEntityQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingId, id);
+                                    List<WarehousingStorageEntity> warehousingStorageEntityList = warehousingStorageService.list(storageEntityQueryWrapper);
+                                    //更新库存流水
+                                    InventoryLogEntity inventoryLogEntity = new InventoryLogEntity();
+                                    inventoryLogEntity.setProductId(warehousingStorageProductModel1.getProductId());
+                                    if (warehousingStorageEntityList!=null&& warehousingStorageEntityList.size()>0){
+                                        inventoryLogEntity.setBusinessNo(warehousingStorageEntityList.get(0).getDocumentNo());
+                                    }
+//                                inventoryLogEntity.setBusinessNo(entity.getBusinessCode());
+                                    inventoryLogEntity.setBusinessType("14");//加工入库
+                                    inventoryLogEntity.setCompanyId( entity.getCompanyId());
+                                    inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
+                                    inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
+                                    inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
+                                    //inventoryLogEntity.setRelevanceBusinessNo();//关联单据号
+                                    inventoryLogEntity.setCode(productWarehouseEntity.getCode());
+                                    inventoryLogEntity.setName(productWarehouseEntity.getName());
+                                    inventoryLogEntity.setPhoto(productWarehouseEntity.getPhoto());
+                                    inventoryLogEntity.setBrandId(productWarehouseEntity.getBrandId());
+                                    inventoryLogEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());
+                                    inventoryLogEntity.setSpec(productWarehouseEntity.getSpec());
+                                    inventoryLogEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
+                                    inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
+                                    inventoryLogEntity.setStorageAreaId(warehousingStorageProductModel1.getStorageAreaId());
+                                    inventoryLogEntity.setBatchNumber(warehousingStorageProductModel1.getBatchNumber());
+                                    inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingStorageProductModel1.getStorageNumber()));
+                                    inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());//库存数量
+
+                                    inventoryLogEntity.setCompanyId( entity.getCompanyId());
+                                    inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
+                                    inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
+                                    inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
+
+                                    inventoryLogService.saveOrUpdate(inventoryLogEntity);
+                                }
+                            }
+
+
                             //原材料生成领用单和出库单和返库单和报损单
                             //领用单
                             WarehousingReceiveForm warehousingReceiveForm=new WarehousingReceiveForm();
@@ -1132,23 +1237,24 @@ public class WorkOrderController {
         //副表数据
         //子表数据
         List<WorkOrderProductEntity> workOrderProductList = workOrderService.getWorkOrderProductList(entity.getId());
-        List<WorkOrderProductEntity> workOrderProductList1= new ArrayList<>();
-        List<WorkOrderProductEntity> workOrderProductLists= new ArrayList<>();
 
 
-        for (WorkOrderProductEntity workOrderProductEntity:workOrderProductList){
+        workOrderMap.put("workOrderProductList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderProductList)));
-            if (workOrderProductEntity.getIsInput().equals("2")){
+
-                workOrderProductList1.add(workOrderProductEntity);
+        List<WorkOrderPrimaryEntity> workOrderPrimaryList1 =new ArrayList<>();
+        List<WorkOrderPrimaryEntity> workOrderPrimaryLists =new ArrayList<>();
+        List<WorkOrderPrimaryEntity> workOrderPrimaryList = workOrderService.getWorkOrderPrimaryList(entity.getId());
+        for (WorkOrderPrimaryEntity workOrderPrimaryEntity:workOrderPrimaryList){
+            if (workOrderPrimaryEntity.getIsInput().equals("2")){
+                workOrderPrimaryList1.add(workOrderPrimaryEntity);
             }else {
-                workOrderProductLists.add(workOrderProductEntity);
+                workOrderPrimaryLists.add(workOrderPrimaryEntity);
             }
         }
-        workOrderMap.put("workOrderProductList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderProductLists)));
-        workOrderMap.put("workOrderProductList1",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderProductList1)));
 
+        workOrderMap.put("workOrderPrimaryList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderPrimaryLists)));
+        workOrderMap.put("workOrderPrimaryList1",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderPrimaryList1)));
 
-        List<WorkOrderPrimaryEntity> workOrderPrimaryList = workOrderService.getWorkOrderPrimaryList(entity.getId());
-        workOrderMap.put("workOrderPrimaryList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(workOrderPrimaryList)));
         //        workOrderMap = generaterSwapUtil.swapDataForm(workOrderMap,WorkOrderConstant.getFormData(),WorkOrderConstant.TABLEFIELDKEY,WorkOrderConstant.TABLERENAMES);
         return ActionResult.success(workOrderMap);
     }

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

@@ -77,4 +77,8 @@ public class WorkOrderPrimaryEntity  {
     @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private String batchNumber;
 
+    /** 投入/副产品 **/
+    @TableField(value = "IS_INPUT" , updateStrategy = FieldStrategy.IGNORED)
+    private String isInput;
+
 }

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

@@ -77,7 +77,4 @@ public class WorkOrderProductEntity  {
     @TableField(exist = false)
     private BigDecimal nums;
 
-    /** 投入/副产品 **/
-    @TableField(value = "IS_INPUT" , updateStrategy = FieldStrategy.IGNORED)
-    private String isInput;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java

@@ -88,4 +88,6 @@ public class VoucherPagination extends Pagination {
     /** 结算量 */
     @JsonProperty("netWeight")
     private String netWeight;
+
+    private String creatorUserName;
 }

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

@@ -22,8 +22,8 @@ public class WorkOrderForm  {
     @JsonProperty("workOrderProductList")
     private List<WorkOrderProductModel> workOrderProductList;
     /** 子表数据 **/
-    @JsonProperty("workOrderProductList1")
+    @JsonProperty("workOrderPrimaryList1")
-    private List<WorkOrderProductModel> workOrderProductList1;
+    private List<WorkOrderPrimaryModel> workOrderPrimaryList1;
 
     /** 子表数据 **/
     @JsonProperty("workOrderPrimaryList")

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

@@ -58,4 +58,8 @@ public class WorkOrderPrimaryModel  {
     @JSONField(name = "batchNumber")
     private String batchNumber;
 
+    /** 投入/副产品 **/
+    @JSONField(name = "isInput")
+    private String isInput;
+
 }

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

@@ -65,8 +65,6 @@ public class WorkOrderProductModel  {
     @JSONField(name = "batchNumber")
     private String batchNumber;
 
-    /** 投入/副产品 **/
+
-    @JSONField(name = "isInput")
-    private String isInput;
 
 }

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue

@@ -1,16 +1,18 @@
 <template>
-  <el-dialog title="选择对账单" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
+  <el-dialog title="选择对账单" :close-on-click-modal="false" :visible.sync="visible"
-    lock-scroll append-to-body width="800px">
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="800px">
     <el-row class="JNPF-common-search-box" :gutter="16">
       <el-form @submit.native.prevent>
         <el-col :span="10">
           <el-form-item label="关键词">
-            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
+            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable
+              @keyup.enter.native="search()" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
+            <el-button type="primary" icon="el-icon-search"
+              @click="search()">{{ $t('common.search') }}
             </el-button>
             <el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
             </el-button>
@@ -19,16 +21,26 @@
       </el-form>
       <div class="JNPF-common-search-box-right">
         <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
+          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+            @click="search()" />
         </el-tooltip>
       </div>
     </el-row>
-    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
+    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange"
+      :border="false">
       <el-table-column prop="code" label="单据编号" align="center" width="200" fixed="left">
       </el-table-column>
-      <el-table-column prop="accountSubjectName" label="对账主体名称" align="center" width="200" fixed="left">
+      <el-table-column prop="accountSubjectName" label="对账主体名称" align="center" width="200">
       </el-table-column>
-      <el-table-column label="单据类型" prop="type" align="center" width="150" fixed="left">
+
+      <el-table-column prop="tableField207" label="结算c重量" align="center" width="200">
+        <template slot-scope="scope">
+          <!-- {{ `scope.row.tableField207[0].settlementTotal`}} -->
+          {{handlerSetTotal(scope.row.tableField207)}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="单据类型" prop="type" align="center" width="150">
         <template slot-scope="scope">
           {{ scope.row.type}}
         </template>
@@ -44,7 +56,8 @@
       <el-table-column prop="accountAmount" label="对账合计（含税）" align="center" width="150">
       </el-table-column>
     </JNPF-table>
-    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
+    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+      @pagination="init" />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
       <el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
@@ -126,6 +139,7 @@ export default {
         data: query
       }).then(res => {
         this.list = res.data.list
+        console.log('list', this.list)
         this.listLoading = false
         this.total = res.data.pagination.total
       })
@@ -152,6 +166,11 @@ export default {
     },
     handleSelectionChange(val) {
       this.checked = val
+    },
+    handlerSetTotal(val) {
+      let temp = 0
+      val.forEach(item => temp += item.settlementSubtotal);
+      return temp
     }
   }
 }

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

@@ -614,21 +614,21 @@ export default {
     bomitemvalueExistNum() {
       debugger
       let isOk = true;
-      var num = '1';
+      // var num = '1';
       var nums = '0';
       for (let i = 0; i < this.dataForm.bomItemValueList.length; i++) {
         const e = this.dataForm.bomItemValueList[i];
         nums = this.jnpf.floatAdd(nums, this.dataForm.bomItemValueList[i].proportionNum)
         //proportionNum 比例数量
-        if (num < nums) {
+        // if (num < nums) {
-          this.$message({
+        //   this.$message({
-            message: '比例数量相加不能大于整数1',
+        //     message: '比例数量相加不能大于整数1',
-            type: 'error',
+        //     type: 'error',
-            duration: 1000
+        //     duration: 1000 
-          });
+        //   });
-          isOk = false
+        //   isOk = false
-          break
+        //   break
-        }
+        // }
         if (nums < 0) {
           this.$message({
             message: '比例数量不能是负数',

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue

@@ -57,6 +57,11 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="6">
+              <el-form-item label="提交人">
+                <el-input v-model="query.creatorUserName" placeholder="请输入" clearable> </el-input>
+              </el-form-item>
+            </el-col>
           </template>
           <el-col :span="6">
             <el-form-item>
@@ -351,7 +356,9 @@ export default {
         supplierName: undefined,
         netWeight: undefined,
         businessType: "1",
-        documentType: "1"
+        documentType: "1",
+        creatorUserName: undefined
+
       },
       treeProps: {
         children: 'children',

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue

@@ -58,6 +58,12 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="6">
+              <el-form-item label="提交人">
+                <el-input v-model="query.creatorUserName" placeholder="请输入" clearable> </el-input>
+              </el-form-item>
+            </el-col>
+
           </template>
           <el-col :span="6">
             <el-form-item>
@@ -325,7 +331,9 @@ export default {
         customerName: undefined,
         netWeight: undefined,
         businessType: "2",
-        documentType: "2"
+        documentType: "2",
+        creatorUserName: undefined
+
       },
       treeProps: {
         children: 'children',

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

@@ -96,14 +96,7 @@
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8" v-if="judgeShow('businessCode')">
+
-            <jnpf-form-tip-item label="外部单据编号" v-if="judgeShow('businessCode')" prop="businessCode">
-              <JnpfInput v-model="dataForm.businessCode" @change="changeData('businessCode', -1)"
-                placeholder="请输入" :disabled="judgeWrite('businessCode')" clearable
-                :style='{ "width": "100%" }'>
-              </JnpfInput>
-            </jnpf-form-tip-item>
-          </el-col>
           <el-col :span="8" v-if="judgeShow('teamId')">
             <jnpf-form-tip-item label="生产班组" v-if="judgeShow('teamId')" prop="teamId">
               <JnpfPopupSelect v-model="dataForm.teamId" @change="changeData('teamId', -1)"
@@ -146,15 +139,6 @@
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="24" v-if="judgeShow('remark')">
-            <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
-                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
-                :style='{ "width": "100%" }'>
-              </JnpfInput>
-            </jnpf-form-tip-item>
-          </el-col>
-
           <el-col :span="8">
             <jnpf-form-tip-item label="成品商品" v-if="judgeShow('productId')" prop="productId">
               <JnpfPopupSelect v-model="dataForm.productId" @change="changeData1" :rowIndex="null"
@@ -167,6 +151,15 @@
             </jnpf-form-tip-item>
           </el-col>
 
+          <el-col :span="24" v-if="judgeShow('remark')">
+            <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
+                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
+                :style='{ "width": "100%" }'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+
           <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="加工成品" contentPosition="left">
@@ -403,17 +396,17 @@
             </jnpf-form-tip-item>
           </el-col>
 
-          <template v-if="this.dataForm.workOrderProductList1!=0">
+          <template v-if="this.dataForm.workOrderPrimaryList1!=0">
             <el-col :span="24">
               <div style="padding:15px 0px">
                 <span style="color: #409EFF;">▋</span>
-                <!-- 如果-- workOrderProductList1 为null 这个副产品就不显示。如果有则显示 -->
+                <!-- 如果-- workOrderPrimaryList1 为null 这个副产品就不显示。如果有则显示 -->
                 <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">副产品</span>
               </div>
             </el-col>
             <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
               <jnpf-form-tip-item label-width="0">
-                <el-table :data="dataForm.workOrderProductList1" size='mini' border>
+                <el-table :data="dataForm.workOrderPrimaryList1" size='mini' border>
                   <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                   <el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')"
                     align="center" fixed="left" prop="productId" width="150px">
@@ -477,66 +470,51 @@
                       </JnpfInput>
                     </template>
                   </el-table-column>
-                  <el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
+                  <el-table-column label="理论产出量(计算前)" v-if="judgeShow('workorderprimary-theoryNum')"
-                    align="center" prop="unitId" width="180px">
+                    align="center" prop="theoryNum" width="300px">
                     <template slot="header">
                       <span class="required-sign"
-                        v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
+                        v-if="judgeRequired(' workorderprimaryList-theoryNum')">*</span>理论产出量(计算前)
                     </template>
                     <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.unitId"
+                      <JnpfInput v-model="scope.row.theoryNum" disabled
-                        @change="changeData('workorderproduct-unitId', scope.$index)"
+                        @change="changeData('workorderprimary-theoryNum', scope.$index)"
-                        placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                        placeholder="请输入" clearable :style='{ "width": "100%" }'>
                       </JnpfInput>
                     </template>
                   </el-table-column>
-                  <el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')"
-                    prop="bomId" align="center" width="300px">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfPopupSelect v-model="scope.row.bomId" @change="changeDataBom"
-                        :formData="dataForm" :templateJson="interfaceRes.workorderproductbomId"
-                        placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
-                        popupTitle="选择数据" popupType="dialog" relationField='bomName'
-                        :field="'bomId' + scope.$index" interfaceId="523054588681531973"
-                        :pageSize="20" :columnOptions="workorderproductbomIdcolumnOptions" clearable
-                        :style='{ "width": "100%" }'>
-                      </JnpfPopupSelect>
-                    </template>
-                  </el-table-column>
 
-                  <el-table-column label="加工数量" align="center" prop="proportionNum" width="180px">
+                  <el-table-column label="理论产出量(计算后)" v-if="judgeShow('workorderprimary-itemsnum')"
+                    align="center" prop="itemsnum" width="210px">
                     <template slot="header">
                       <span class="required-sign"
-                        v-if="judgeRequired('workorderproductList-proportionNum')">*</span>加工数量
+                        v-if="judgeRequired('workorderprimaryList-itemsnum')">*</span>理论产出量(计算后)
                     </template>
                     <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.proportionNum"
+
-                        @change="changeData('workorderproduct-proportionNum', scope.$index)"
+                      <JnpfInput v-model="scope.row.itemsnum"
-                        placeholder="请输入"
+                        v-if="dataForm.workOrderProductList[0].planNum !=''" disabled
-                        :disabled="(judgeWrite('workorderproductList') || judgeWrite('workorderproductList-proportionNum')) ||  dataForm.type==2"
+                        @change="changeData('workorderprimary-theoryNum', scope.$index)"
-                        clearable :style='{ "width": "100%" }'>
+                        placeholder="请输入计划加工数量" clearable :style='{ "width": "100%" }'>
+                      </JnpfInput>
+                      <JnpfInput v-model="scope.row.theoryNum" v-else disabled
+                        @change="changeData('workorderprimary-theoryNum', scope.$index)"
+                        placeholder="请输入计划加工数量" clearable :style='{ "width": "100%" }'>
                       </JnpfInput>
                     </template>
                   </el-table-column>
 
-                  <el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')"
+                  <el-table-column label="实际产出量" v-if="judgeShow('workorderprimary-realityNum')"
-                    prop="cost" align="center" width="180px">
+                    align="center" prop="realityNum" width="200px">
-
                     <template slot="header">
                       <span class="required-sign"
-                        v-if="judgeRequired('workorderproductList-cost')">*</span>参考成本价
+                        v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际产出量
                     </template>
-
                     <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.cost"
+                      <JnpfInput v-model="scope.row.realityNum"
-                        @change="changeData('workorderproduct-cost', scope.$index)"
+                        @change="changeData('workorderprimary-realityNum', scope.$index)"
-                        placeholder="请输入"
+                        :disabled="judgeWrite('workorderprimaryList') || judgeWrite('workorderprimaryList-realityNum')"
-                        :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
+                        placeholder="请输入1" clearable :style='{ "width": "100%" }'>
-                        clearable :style='{ "width": "100%" }'>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -569,7 +547,7 @@
                     width="180px" prop="batchNumber">
                     <template slot="header">
                       <span class="required-sign"
-                        v-if="judgeRequired('workorderproductList-batchNumber')">*</span>成品批次号
+                        v-if="judgeRequired('workorderproductList-batchNumber')">*</span>批次号
                     </template>
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.batchNumber"
@@ -643,18 +621,6 @@
                   </template>
                 </el-table-column>
 
-                <!-- <el-table-column label="商品" prop="name" width="300px" align="center">
-<template slot="header">
-  <span class="required-sign">*</span>商品
-</template>
-
-<template slot-scope="scope">
-  <JnpfInput v-model="scope.row.name" placeholder="请输入" disabled clearable
-    :style='{ "width": "100%" }'>
-  </JnpfInput>
-</template>
-</el-table-column> -->
-
                 <el-table-column label="存货类型" prop="productTypeId" align="center">
 
                   <template slot="header">
@@ -725,16 +691,6 @@
                       v-if="judgeRequired('workorderprimaryList-itemsnum')">*</span>理论发料量(计算后)
                   </template>
                   <template slot-scope="scope">
-                    <!-- <JnpfInput v-model="scope.row.itemsnum"
-                      disabled
-                      @change="changeData('workorderprimary-theoryNum', scope.$index)"
-                      placeholder="请输入11" clearable :style='{ "width": "100%" }'>
-                    </JnpfInput> -->
-
-                    <!-- <JnpfInput v-model="scope.row.itemsnum" disabled
-                      @change="changeData('workorderprimary-theoryNum', scope.$index)"
-                      placeholder="请输入22" clearable :style='{ "width": "100%" }'>
-                    </JnpfInput> -->
 
                     <JnpfInput v-model="scope.row.itemsnum"
                       v-if="dataForm.workOrderProductList[0].planNum !=''" disabled
@@ -962,7 +918,7 @@ export default {
           enabledmark: undefined,
           isInput: '1'
         },
-        workOrderProductList1: {
+        workOrderPrimaryList1: {
           productId: '',
           productIdOptions: [],
           unitId: '',
@@ -1012,7 +968,7 @@ export default {
         remark: undefined,
         status: "1",
         workOrderProductList: [],
-        workOrderProductList1: [],
+        workOrderPrimaryList1: [],
         workOrderPrimaryList: [],
         version: 0,
       },
@@ -1188,14 +1144,20 @@ export default {
         this.dataForm.workOrderPrimaryList.push(item)
       }
 
-      this.dataForm.workOrderProductList1 = []
+      this.dataForm.workOrderPrimaryList1 = []
       for (let i = 0; i < index.productWarehouseEntityList1.length; i++) {
-        const e = index.productWarehouseEntityList[i];
+        const e = index.productWarehouseEntityList1[i];
         let item = {
           productId: e.productId,
           productTypeId: e.productTypeId,
           spec: e.spec,
           inventoryUnitId: e.inventoryUnitId,
+          realityNum: 0,
+          returnNum: 0,
+          reportlossNum: 0,
+          productTypeId: e.productTypeId,
+          spec: e.spec,
+          inventoryUnitId: e.inventoryUnitId,
           unitId: e.inventoryUnitId,
           barCode: e.barCode,
           theoryNum: e.theoryNum,
@@ -1205,7 +1167,7 @@ export default {
           isInput: '2',
           bomId: e.bomId,
         }
-        this.dataForm.workOrderProductList1.push(item)
+        this.dataForm.workOrderPrimaryList1.push(item)
       }
 
 
@@ -1246,6 +1208,15 @@ export default {
           })
         })
       }
+      if (this.dataForm.workOrderProductList[index].planNum == '') {
+        this.oldtheoryNum.filter((item) => {
+          this.dataForm.workOrderPrimaryList1.filter((sub) => {
+            if (item.productId == sub.productId) {
+              sub.theoryNum = item.theoryNum
+            }
+          })
+        })
+      }
     },
     planNum(val, index) {
       debugger
@@ -1266,9 +1237,24 @@ export default {
         })
       }
 
-
+      if (this.dataForm.workOrderPrimaryList1.length == 0) {
+        this.$alert('请先选择BOM', {
+          confirmButtonText: '确定',
+        });
+        this.dataForm.workOrderProductList[index].planNum = undefined
+      } else if (val == 0) {
+        this.dataForm.workOrderPrimaryList1.filter((item) => {
+          item.itemsnum = this.jnpf.floatMul(item.theoryNum, 1)
+        })
+      } else {
+        this.dataForm.workOrderPrimaryList1.filter((item) => {
+          item.itemsnum = this.jnpf.floatMul(item.theoryNum, val)
+          // console.log(item.itemsnum);
+        })
+      }
     },
 
+
     changeDataFormData(type, data, model, index, defaultValue) {
       if (!this.isEdit) {
         if (type == 2) {