订单行逻辑问题修改

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReceiptOrderMapper.xml

@@ -83,6 +83,8 @@
         <id column="f_last_modify_user_id" property="lastModifyUserId"/>
         <id column="clear_weight" property="clearWeight"/>
         <id column="inventory_no" property="inventoryNo"/>
+        <id column="ord_ln" property="ordLn"/>
+        <id column="order_line" property="orderLine"/>
     </resultMap>
 
     <select id="queryReceiptOrderList" resultMap="receiptOrder">

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml

@@ -124,7 +124,7 @@
             e.f_en_code AS COMP_CD,
             f.f_en_code AS DEPT_ID,
             a.document_no AS PROD_ZL,
-            aa.ord_ln as CK_ORDER,
+            aa.order_line as CK_ORDER,
             IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
             d.CODE AS CUS_ID,
             d.NAME AS CUS_NAME,
@@ -166,8 +166,8 @@
                 LEFT JOIN base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
                 LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
                 LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
-                LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and  aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id
+                LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and  aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id and aa.ord_ln = n.ord_ln
-                LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and  aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id
+                LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and  aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = n.ord_ln
         WHERE
             a.f_delete_mark is null
           AND a.id = #{id}

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

@@ -499,9 +499,12 @@ public class DeliveryOrderServiceImpl extends ServiceImpl<DeliveryOrderMapper, D
         }
         if (deliveryOrderForm.getDeliveryProductRelationList()!=null){
             List<DeliveryProductRelationEntity> tableField144 = JsonUtil.getJsonToList(deliveryOrderForm.getDeliveryProductRelationList(),DeliveryProductRelationEntity.class);
+            int line = 1;
             for(DeliveryProductRelationEntity entitys : tableField144){
                 entitys.setId(RandomUtil.uuId());
                 entitys.setOrderId(entity.getId());
+                entitys.setOrderLine(String.valueOf(line));
+                line++;
                 if(isSave){
                 }else{
                 }

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

@@ -674,6 +674,7 @@ public class WarehousingNotificationServiceImpl extends ServiceImpl<WarehousingN
         }
         if (warehousingNotificationForm.getWarehousingProductList()!=null){
             List<WarehousingProductEntity> tableField121 = JsonUtil.getJsonToList(warehousingNotificationForm.getWarehousingProductList(),WarehousingProductEntity.class);
+            int line = 1;
             for(WarehousingProductEntity entitys : tableField121){
                 entitys.setId(RandomUtil.uuId());
                 entitys.setWarehousingId(entity.getId());
@@ -681,6 +682,8 @@ public class WarehousingNotificationServiceImpl extends ServiceImpl<WarehousingN
                     entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
                 }
                 entitys.setProduceDate(new Date());
+                entitys.setOrderLine(String.valueOf(line));
+                line++;
                 if(isSave){
                 }else{
                 }

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

@@ -720,7 +720,6 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
             //统计发货数量
             BigDecimal countNum = BigDecimal.ZERO;
 //            List<WarehousingStorageProductEntity> tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class);
-            int line = 1;
             for(DeliveryProductRelationModel entitys : deliveryOrderForm.getDeliveryProductRelationList()){
                 countNum = countNum.add(entitys.getDeliveryNum());
                 WarehousingOutboundProductEntity warehousingOutboundProductEntity = new WarehousingOutboundProductEntity();
@@ -739,9 +738,9 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 warehousingOutboundProductEntity.setCompanyId(deliveryOrder.getCompanyId());
                 warehousingOutboundProductEntity.setDepartmentId(deliveryOrder.getDepartmentId());
                 warehousingOutboundProductEntity.setBusinessPrice(entitys.getReturnUnit());//采购发货单出库
-                warehousingOutboundProductEntity.setOrdLn(String.valueOf(line));
+                warehousingOutboundProductEntity.setOrdLn(entitys.getOrdLn());//销售订单行号
+                warehousingOutboundProductEntity.setOrderLine(entitys.getOrderLine());//销售发货单订单行号
                 warehousingOutboundProductService.saveOrUpdate(warehousingOutboundProductEntity);
-                line++;
 
 
                 //查询商品详情

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

@@ -769,7 +769,6 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
             //统计收货数量
             BigDecimal countNum = BigDecimal.ZERO;
 //            List<WarehousingStorageProductEntity> tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class);
-            int line = 1;
             for(DeliveryProductRelationModel entitys : receiptOrderForm.getDeliveryProductRelationList()){
                 countNum = countNum.add(entitys.getDeliveryNum());
                 WarehousingStorageProductEntity warehousingStorageProductEntity = new WarehousingStorageProductEntity();
@@ -788,9 +787,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                 warehousingStorageProductEntity.setOrganizeJsonId(receiptOrder.getOrganizeJsonId());
                 warehousingStorageProductEntity.setCompanyId(receiptOrder.getCompanyId());
                 warehousingStorageProductEntity.setDepartmentId(receiptOrder.getDepartmentId());
-                warehousingStorageProductEntity.setOrdLn(String.valueOf(line));
+                warehousingStorageProductEntity.setOrdLn(entitys.getOrdLn());
                 warehousingStorageProductService.saveOrUpdate(warehousingStorageProductEntity);
-                line++;
 
                 //查询商品详情
                 ProductWarehouseEntity productWarehouseEntity = new ProductWarehouseEntity();

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

@@ -994,13 +994,13 @@ public class BusinessOrderController {
             List<WarehousingProductEntity> list = warehousingNotificationService.queryInBoundNoticeInfo(businessOrderEntity.getId(),"1");
             if (list != null && list.size()>0) {
                 //对入库通知中相同的商品进行通知数量合并
-                List<WarehousingProductEntity> warehousingProductEntityList = list.stream().collect(Collectors.toMap(s -> s.getProductId()+";"+s.getPurchaseUnitId(), a -> a, (o1, o2) -> {
+                List<WarehousingProductEntity> warehousingProductEntityList = list.stream().collect(Collectors.toMap(s -> s.getProductId()+";"+s.getPurchaseUnitId()+";"+s.getOrdLn(), a -> a, (o1, o2) -> {
                     o1.setNotificationStorageNumber(o1.getNotificationStorageNumber().add(o2.getNotificationStorageNumber()));
                     return o1;
                 })).values().stream().collect(Collectors.toList());
                 for (int i = 0; i < businessOrderProductRelationalList.size(); i++) {
                     for (int j = 0; j < warehousingProductEntityList.size(); j++) {
-                        if (businessOrderProductRelationalList.get(i).getProductId().equals(warehousingProductEntityList.get(j).getProductId()) && businessOrderProductRelationalList.get(i).getSalesMainUnitId().equals(warehousingProductEntityList.get(j).getPurchaseUnitId())) {
+                        if (businessOrderProductRelationalList.get(i).getProductId().equals(warehousingProductEntityList.get(j).getProductId()) && businessOrderProductRelationalList.get(i).getOrdLn().equals(warehousingProductEntityList.get(j).getOrdLn())) {
                             BigDecimal num = businessOrderProductRelationalList.get(i).getBusinessNum().subtract(warehousingProductEntityList.get(j).getNotificationStorageNumber());
                             businessOrderProductRelationalList.get(i).setRemainingStockableQuantity(num);
                             businessOrderProductRelationalList.get(i).setNotificationStorageNumber(num);
@@ -1063,13 +1063,13 @@ public class BusinessOrderController {
         List<WarehousingProductEntity> list = warehousingNotificationService.queryInBoundNoticeInfo(businessOrderEntity.getId(),"8");
         if (list != null && list.size()>0) {
             //对出库通知中相同的商品进行通知数量合并
-            List<WarehousingProductEntity> warehousingProductEntityList = list.stream().collect(Collectors.toMap(s -> s.getProductId()+";"+s.getPurchaseUnitId(), a -> a, (o1, o2) -> {
+            List<WarehousingProductEntity> warehousingProductEntityList = list.stream().collect(Collectors.toMap(s -> s.getProductId()+";"+s.getPurchaseUnitId()+";"+s.getOrdLn(), a -> a, (o1, o2) -> {
                 o1.setNotificationStorageNumber(o1.getNotificationStorageNumber().add(o2.getNotificationStorageNumber()));
                 return o1;
             })).values().stream().collect(Collectors.toList());
             for (int i = 0; i < businessOrderProductRelationalList.size(); i++) {
                 for (int j = 0; j < warehousingProductEntityList.size(); j++) {
-                    if (businessOrderProductRelationalList.get(i).getProductId().equals(warehousingProductEntityList.get(j).getProductId()) && businessOrderProductRelationalList.get(i).getSalesMainUnitId().equals(warehousingProductEntityList.get(j).getPurchaseUnitId())) {
+                    if (businessOrderProductRelationalList.get(i).getProductId().equals(warehousingProductEntityList.get(j).getProductId()) && businessOrderProductRelationalList.get(i).getOrdLn().equals(warehousingProductEntityList.get(j).getOrdLn())) {
                         BigDecimal num = businessOrderProductRelationalList.get(i).getBusinessNum().subtract(warehousingProductEntityList.get(j).getNotificationStorageNumber());
                         businessOrderProductRelationalList.get(i).setRemainingStockableQuantity(num);
                         businessOrderProductRelationalList.get(i).setNotificationStorageNumber(num);

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

@@ -1161,11 +1161,11 @@ public class WorkOrderController {
                             }
 
                         }
-                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderByYunguan(id);
+//                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderByYunguan(id);
-                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
+//                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
-                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
+//                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
-
+//
-                        }
+//                        }
                     }
                 }
 

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

@@ -90,6 +90,10 @@ public class DeliveryProductRelationEntity  {
     private BigDecimal clearWeight;
     @TableField(value = "INVENTORY_NO" , updateStrategy = FieldStrategy.IGNORED)
     private String inventoryNo;
+    @TableField("ORD_LN")
+    private String ordLn;
+    @TableField("ORDER_LINE")
+    private String orderLine;
 
     @TableField(exist = false)
     private BigDecimal remainingStockableQuantity;

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

@@ -73,6 +73,8 @@ public class WarehousingOutboundProductEntity  {
     private BigDecimal businessPrice;
     @TableField("ORD_LN")
     private String ordLn;
+    @TableField("ORDER_LINE")
+    private String orderLine;
 
     /**
      * 退货单的商品列表

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

@@ -83,6 +83,12 @@ public class WarehousingProductEntity  {
 
     @TableField("BUSINESS_PRICE")
     private BigDecimal businessPrice;
+    @TableField("ORD_LN")
+    private String ordLn;
+
+    @TableField("ORDER_LINE")
+    private String orderLine;
+
 
     @TableField(exist = false)
     private String storageUnit;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java

@@ -91,4 +91,10 @@ public class DeliveryProductRelationModel  {
     /** 批次号库存数量 **/
     @JSONField(name = "inventoryNo")
     private String inventoryNo;
+    /** 订单行号 **/
+    @JSONField(name = "ordLn")
+    private String ordLn;
+    /** 销售订单行号 **/
+    @JSONField(name = "orderLine")
+    private String orderLine;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryProductRelationModel.java

@@ -87,4 +87,7 @@ public class DeliveryProductRelationModel  {
     /** 净重 **/
     @JSONField(name = "clearWeight")
     private BigDecimal clearWeight;
+    /** 订单行 **/
+    @JSONField(name = "ordLn")
+    private String ordLn;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java

@@ -68,4 +68,8 @@ public class WarehousingProductModel  {
     /** 业务单价 **/
     @JSONField(name = "businessPrice")
     private String businessPrice;
+    /** 销售订单行 **/
+    @JSONField(name = "ordLn")
+    private String ordLn;
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingoutbound/WarehousingOutboundProductModel.java

@@ -61,5 +61,11 @@ public class WarehousingOutboundProductModel  {
     @JSONField(name = "businessPrice")
     private String businessPrice;
 
+    /** 销售订单行 **/
+    @JSONField(name = "ordLn")
+    private String ordLn;
+    /** 出库通知订单行 **/
+    @JSONField(name = "orderLine")
+    private String orderLine;
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingstorage/WarehousingStorageProductModel.java

@@ -64,6 +64,10 @@ public class WarehousingStorageProductModel  {
     /** 业务单价 **/
     @JSONField(name = "businessPrice")
     private String businessPrice;
+    /** 销售订单行 **/
+    @JSONField(name = "ordLn")
+    private String ordLn;
+
 
 
 }

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

@@ -1806,7 +1806,6 @@ export default {
         item.returnUnit = item.businessPrice
         item.businessType = "1"
       });
-      debugger
       this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList;
       this.productByOrderList = val2.businessOrderProductRelationalList;
     },

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

@@ -469,8 +469,8 @@
                       ">*</span>出库货区
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.storageAreaId" @change="batchNoMethod"
+                    <JnpfPopupSelectInnerName v-model="scope.row.storageAreaId"
-                      :rowIndex="scope.$index" :formData="dataForm"
+                      @change="batchNoMethod" :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
                       :disabled="judgeWrite('warehousingproductList-storageAreaId') ||judgeWrite('warehousingproductList-storageAreaId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
@@ -478,7 +478,7 @@
                       interfaceId="549927783325776837" :pageSize="20"
                       :columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
                       :style="{ width: '100%' }">
-                    </JnpfPopupSelect>
+                    </JnpfPopupSelectInnerName>
                   </template>
                 </el-table-column>
                 <el-table-column label="出库单位"
@@ -602,12 +602,14 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingproductList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingproductList')">
                   <template slot-scope="scope">
+                    <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                      @click="createwarehousingproductList(scope.row)">添加</el-button>
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousingproductList(scope.$index)">删除</el-button>
                   </template>
-                </el-table-column> -->
+                </el-table-column>
               </el-table>
               <!-- <div class="table-actions" @click="addwarehousingproductList()"
                 v-if="!judgeWrite('warehousingproductList')">
@@ -889,9 +891,31 @@ export default {
     this.initSaleData();
   },
   methods: {
-    batchNoMethod(val, val2, idx) {
+    batchNoMethod(val, val2, index) {
-      this.dataForm.warehousingProductList[idx].batchNo = val2.batch_number
+      // this.dataForm.warehousingProductList[idx].batchNo = val2.batch_number
-      this.dataForm.warehousingProductList[idx].produceDate = val2.produce_date
+      // this.dataForm.warehousingProductList[idx].produceDate = val2.produce_date
+
+      let idx = index
+      for (let i = 0; i < val2.length; i++) {
+        if (i == 0) {
+          this.dataForm.warehousingProductList[idx].storageAreaId = undefined
+          this.dataForm.warehousingProductList[idx].batchNo = undefined
+          this.dataForm.warehousingProductList[idx].produceDate = undefined
+          // this.dataForm.warehousingProductList[idx].inventoryNo = undefined
+          this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
+          this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
+          this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date
+          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
+        } else {
+          let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index]))
+          this.createwarehousingproductList(item)
+          this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId
+          this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number
+          this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date
+          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
+        }
+        idx++
+      }
     },
     initSaleData() {
       const data = this.setting.selectData;
@@ -1061,9 +1085,8 @@ export default {
         purchaseNum: undefined,
         storageAreaId: undefined,
         warehousingUnitId: undefined,
-        barCode: undefined,
+        remainingStockableQuantity: undefined,
         notificationStorageNumber: undefined,
-        volume: undefined,
         batchNo: undefined,
         produceDate: undefined,
         remark: undefined
@@ -1087,6 +1110,20 @@ export default {
       this.isEdit = false;
       this.childIndex = -1;
     },
+    createwarehousingproductList(value) {
+      let item = JSON.parse(JSON.stringify(val));
+      item.purchaseNum = 0;
+      item.storageAreaId = undefined;
+      item.remainingStockableQuantity = 0;
+      item.notificationStorageNumber = undefined;
+      item.batchNo = undefined;
+      item.produceDate = undefined;
+      this.dataForm.warehousingProductList.push(item);
+      this.childIndex = this.dataForm.warehousingProductList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
+    },
     openSelectDialog(key) {
       this.currTableConf = this.addTableConf[key];
       this.currVmodel = key;

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

@@ -783,7 +783,9 @@ export default {
             storageNumber: e.storageNumber,
             receivedQuantity: e.receivedQuantity,
             businessPrice: e.businessPrice,
-            dateManufacture: new Date().getTime()
+            dateManufacture: new Date().getTime(),
+            ordLn: e.ordLn,
+            orderLine: e.orderLine
           }
           this.dataForm.warehousingOutboundProductList.push(item)
         }

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

@@ -269,13 +269,13 @@
                     <JnpfInput v-model="scope.row.vehicleName" placeholder="请输入" disabled clearable
                       :style='{ "width": "100%" }'>
                     </JnpfInput>
-</template>
+                  </template>
                 </el-table-column>
                 <el-table-column label="商品名称" prop="productName" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>商品名称
-</template>
+                  </template>
 
                   <template slot-scope="scope">
   <JnpfInput v-model="scope.row.productName" placeholder="请输入" disabled clearable
@@ -812,7 +812,8 @@ export default {
             storageNumber: e.notificationStorageNumber,
             receivedQuantity: e.receivedQuantity,
             businessPrice: e.businessPrice,
-            dateManufacture: new Date().getTime()
+            dateManufacture: new Date().getTime(),
+            ordLn: e.ordLn
           }
           this.dataForm.warehousingStorageProductList.push(item)
         }