删除订单，修改磅单状态

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java

@@ -24,6 +24,7 @@ import jnpf.materialvo.service.MaterialService;
 import jnpf.mobilePort.utils.FileCopy;
 import jnpf.payment.model.payment.PaymentListVO;
 import jnpf.payment.service.PaymentService;
+import jnpf.paymentdoc.entity.PaymentdocItem1Entity;
 import jnpf.permission.entity.UserEntity;
 import jnpf.permission.service.UserService;
 import jnpf.poundlist.entity.PoundlistEntity;
@@ -521,6 +522,15 @@ public class PurchaseorderController {
         String[] idList = ids.split(",");
         int i = 0;
         for (String allId : idList) {
+            QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,allId);
+            queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
+            List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+            List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
+            for (PoundlistEntity poundlistEntity: poundlistList) {
+                poundlistEntity.setPurchaseStatus("99");
+            }
+            poundlistService.updateBatchById(poundlistList);
             this.delete(allId);
             i++;
         }
@@ -921,6 +931,15 @@ public class PurchaseorderController {
         }
         if (entity != null) {
             purchaseorderitemService.delete(entity);
+            QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId());
+            queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
+            List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+            List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
+            for (PoundlistEntity poundlistEntity: poundlistList) {
+                poundlistEntity.setPurchaseStatus("99");
+            }
+            poundlistService.updateBatchById(poundlistList);
             QueryWrapper<Purchaseorder_item0Entity> queryWrapperPurchaseorder_item0 = new QueryWrapper<>();
             queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId());
             purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0);

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -33,6 +33,7 @@ import jnpf.materialvo.entity.MaterialEntity;
 import jnpf.materialvo.service.MaterialService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
+import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
 import jnpf.receiptin.entity.Receiptin_item0Entity;
 import jnpf.receiptin.service.Receiptin_item0Service;
 import jnpf.receiptout.entity.ReceiptoutEntity;
@@ -41,7 +42,10 @@ import jnpf.receiptout.service.ReceiptoutService;
 import jnpf.receiptout.service.Receiptout_item0Service;
 import jnpf.reservoirarea.entity.ReservoirareaEntity;
 import jnpf.reservoirarea.service.ReservoirareaService;
+import jnpf.saleback.entity.Saleback_item0Entity;
 import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
+import jnpf.vehicle.entity.VehicleEntity;
+import jnpf.vehicle.service.VehicleService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -89,6 +93,7 @@ import jnpf.util.GeneraterSwapUtil;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import jnpf.util.file.UploadUtil;
 import jnpf.util.enums.FileTypeEnum;
@@ -155,6 +160,8 @@ public class SaleorderitemController {
     private ContractFileService contractFileService;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private VehicleService vehicleService;
 
     /**
      * 修改磅单单价
@@ -214,12 +221,27 @@ public class SaleorderitemController {
                             entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
                         }
                     }
+                    VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
+                    if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
+                        entity.setVehicleName(vehicleEntity.getTicketno());
+                    }
+                    MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
+                    if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
+                        entity.setMaterialName(materialEntity.getItemName());
+                    }
                     QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
                     queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
                     PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
                     entity.setPoundEntity(poundlistEntity);
                     entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
                 }
+                if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
+                    CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
+                    if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
+                        saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
+                    }
+                }
+                saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
                 saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
                 saleorderitemEntity.setList(dList);
                 list.add(saleorderitemEntity);
@@ -669,6 +691,15 @@ public class SaleorderitemController {
         String[] idList = ids.split(",");
 		int i =0;
         for (String allId : idList){
+            QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,allId);
+            queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
+            List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+            List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
+            for (PoundlistEntity poundlistEntity: poundlistList) {
+                poundlistEntity.setSalesStatus("99");
+            }
+            poundlistService.updateBatchById(poundlistList);
             this.delete(allId);
             i++;
         }
@@ -1010,6 +1041,15 @@ public class SaleorderitemController {
         SaleorderitemEntity entity= saleorderitemService.getInfo(id);
         if(entity!=null){
             saleorderitemService.delete(entity);
+            QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
+            queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
+            List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+            List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
+            for (PoundlistEntity poundlistEntity: poundlistList) {
+                poundlistEntity.setSalesStatus("99");
+            }
+            poundlistService.updateBatchById(poundlistList);
             QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
             queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
             salesorder_item0Service.remove(queryWrapperSalesorder_item0);

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java

@@ -179,5 +179,7 @@ public class SaleorderitemEntity  {
     private String contractName;
     @TableField(exist = false)
     private String customerName;
+    @TableField(exist = false)
+    private String sourceName;
 
 }

SC-web/src/views/scm/basicInformation/poundlist/index.vue

@@ -735,6 +735,15 @@
 				}).catch(() => {})
 			},
 			addOrUpdateHandle(row) {
+        debugger
+        if(row.purchaseStatus != '99' || row.salesStatus != '99'){
+          this.$message({
+            type: 'error',
+            message: '该磅单当前状态不允许编辑',
+            duration: 2500
+          });
+          return
+        }
         var id = undefined;
         if(row.isInvoicing == '1'){
           var msg = '开进项票';

SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue

@@ -29,14 +29,17 @@
           <el-col :span="8">
             <el-form-item label="来源单号"
                           prop="sourceNo">
-              <popupSelect v-model="dataForm.sourceNo"
+<!--              <popupSelect v-model="dataForm.sourceNo"
                            placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117"
                            :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no"
                            popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px" disabled
                            hasPage :pageSize="20">
 
-              </popupSelect>
+              </popupSelect>-->
+              <el-input v-model="dataForm.sourceName"
+                        placeholder="请输入来源单号" readonly clearable :style='{"width":"100%"}' disabled>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -44,7 +47,6 @@
                           prop="amount">
               <el-input v-model="dataForm.amount"
                         placeholder="请输入出库金额" readonly clearable :style='{"width":"100%"}' disabled>
-
               </el-input>
             </el-form-item>
           </el-col>
@@ -71,13 +73,16 @@
           <el-col :span="8">
             <el-form-item label="客户"
                           prop="customerId">
-              <popupSelect v-model="dataForm.customerId"
+<!--              <popupSelect v-model="dataForm.customerId"
                            placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749"
                            :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm"
                            popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px" disabled
                            hasPage :pageSize="20">
-              </popupSelect>
+              </popupSelect>-->
+              <el-input v-model="dataForm.customerName"
+                        placeholder="请输入客户" readonly clearable :style='{"width":"100%"}' disabled>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="16">
@@ -123,26 +128,32 @@
                       <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
                         <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.vehicleId"
+<!--                          <popupSelect v-model="scope.row.vehicleId"
                                        placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
                                        interfaceId="398732963950472005"
                                        :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id"
                                        relationField="ticketno" popupType="dialog"
                                        popupWidth="800px"
                                        hasPage :pageSize="20" disabled>
-                          </popupSelect>
+                          </popupSelect>-->
+                          <el-input v-model="dataForm.vehicleName"
+                                    placeholder="请输入车牌号" readonly clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="materialId" label="物料名称" align="center" width="180">
                         <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.materialId"
+<!--                          <popupSelect v-model="scope.row.materialId"
                                        placeholder="请选择" clearable :field="'materialId'+scope.$index"
                                        interfaceId="398719564478785669"
                                        :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id"
                                        relationField="item_name" popupType="dialog"
                                        popupWidth="800px" disabled
                           >
-                          </popupSelect>
+                          </popupSelect>-->
+                          <el-input v-model="dataForm.materialName"
+                                    placeholder="请输入物料名称" readonly clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
@@ -271,6 +282,8 @@
           documentNo: '',
           type: "0",
           salesId: "",
+          sourceNo: "",
+          sourceName: "",
           amount: '',
           currency: "0",
           num: '',
@@ -402,21 +415,22 @@
         this.dataForm.num = list[0].num;
         this.dataForm.sourceNo = list[0].id;
         this.dataForm.customerId = list[0].customerId;
-        debugger
+        this.dataForm.customerName = list[0].customerName;
+        this.dataForm.sourceName = list[0].sourceName;
         this.dataForm.receiptout_item0List = list[0].list;
         for (let i = 0; i < list[0].list.length; i++) {
+          this.dataForm.receiptout_item0List[i].vehicleName = list[0].list[i].vehicleName;
+          this.dataForm.receiptout_item0List[i].materialName = list[0].list[i].materialName;
           this.dataForm.receiptout_item0List[i].amount = list[0].list[i].price;
           this.dataForm.receiptout_item0List[i].price = list[0].list[i].unitPrice;
           this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement;
-          this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
-          this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
-          debugger
           this.rateOptions.find((item) => {
             if (this.dataForm.receiptout_item0List[i].rate == item.id) {
               this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100)
-              debugger
             }
           })
+          this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
+          this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
         }
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },