Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -22,6 +22,8 @@ import jnpf.collection.service.Collection_item0Service;
 import jnpf.config.ConfigValueUtil;
 import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.contractfile.service.ContractFileService;
+import jnpf.customer.entity.CustomerEntity;
+import jnpf.customer.service.CustomerService;
 import jnpf.exception.DataException;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
@@ -89,6 +91,8 @@ public class CollectionController {
     private PoundlistService poundlistService;
     @Autowired
     private ContractFileService contractFileService;
+    @Autowired
+    private CustomerService customerService;
     /**
      * 单据编号显示
      *
@@ -486,6 +490,20 @@ public class CollectionController {
     @GetMapping("/{id}")
     public ActionResult<CollectionInfoVO> info(@PathVariable("id") String id){
         CollectionEntity entity= collectionService.getInfo(id);
+        if(ObjectUtils.isNotEmpty(entity)){
+            if (StringUtils.isNotEmpty(entity.getCustomerId())){
+                CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
+                if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
+                    entity.setCustomerNm(customerEntity.getSupplierNm());
+                }
+            }
+            if (StringUtils.isNotEmpty(entity.getContractId())){
+                ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId());
+                if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
+                    entity.setContractNm(contractFileEntity.getContractName());
+                }
+            }
+        }
         CollectionInfoVO vo=JsonUtil.getJsonToBean(entity, CollectionInfoVO.class);
 
     //子表
@@ -495,6 +513,13 @@ public class CollectionController {
             queryWrapper.lambda().eq(SaleorderitemEntity::getId, collection_item0Entity.getSalesorderId());
             SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
             if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
+                if (StringUtils.isNotEmpty(saleorderitemEntity.getContractId())){
+                    ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId());
+                    if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractCode())){
+                        collection_item0Entity.setContractCode(contractFileEntity.getContractCode());
+                    }
+                }
+                collection_item0Entity.setSourceName(saleorderitemEntity.getDocumentNo());
                 collection_item0Entity.setPrice(saleorderitemEntity.getPrice());
                 collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected());
                 collection_item0Entity.setContractId(saleorderitemEntity.getContractId());

SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java

@@ -78,9 +78,9 @@ public class Collection_item0Entity  {
     @TableField(exist = false)
     private BigDecimal amountCollected;
 
-//    /** 合同编码 **/
+    /** 合同编码 **/
-//    @TableField(exist = false)
+    @TableField(exist = false)
-//    private String contractCode;
+    private String contractCode;
 
     /** 重量 **/
     @TableField(exist = false)
@@ -101,5 +101,8 @@ public class Collection_item0Entity  {
     /** 合同编码 **/
     @TableField(exist = false)
     private String contractId;
+    /**销售订单号*/
+    @TableField(exist = false)
+    private String sourceName;
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java

@@ -80,4 +80,10 @@ public class CollectionInfoVO{
         @JsonProperty("collection_item0List")
         private List<Collection_item0Model> collection_item0List;
 
+        @JsonProperty("customerNm")
+        private String customerNm;
+
+        @JsonProperty("contractNm")
+        private String contractNm;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java

@@ -59,4 +59,12 @@ public class Collection_item0Model  {
     @JsonProperty("creatorTime")
     private Long  creatorTime;
 
+    /** 合同编码 **/
+    @JsonProperty("contractCode")
+    private String contractCode;
+
+    /** 销售订单号 **/
+    @JsonProperty("sourceName")
+    private String sourceName;
+
 }

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

@@ -585,10 +585,18 @@ public class PurchaseorderController {
         PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
         PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
         vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
-        /*SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId());
+        if(StringUtils.isNotEmpty(vo.getSupplierId())) {
-        if(supplierEntity != null){
+            SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId());
+            if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())) {
                 vo.setSupplierName(supplierEntity.getSupplierName());
-        }*/
+            }
+        }
+        if (StringUtils.isNotEmpty(vo.getContractCode())){
+            ContractFileEntity contractFileEntity = contractFileService.getById(vo.getContractCode());
+            if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
+                vo.setContractName(contractFileEntity.getContractName());
+            }
+        }
 
 
         if (vo.getCreatorTime() != null) {

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java

@@ -21,12 +21,16 @@ import jnpf.materialvo.entity.MaterialEntity;
 import jnpf.materialvo.service.MaterialService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
+import jnpf.reservoirarea.entity.ReservoirareaEntity;
+import jnpf.reservoirarea.service.ReservoirareaService;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.saleorder.entity.Salesorder_item0Entity;
 import jnpf.saleorder.service.SaleorderitemService;
 import jnpf.saleorder.service.Salesorder_item0Service;
 import jnpf.vehicle.entity.VehicleEntity;
 import jnpf.vehicle.service.VehicleService;
+import jnpf.warehouse.entity.WareHouseEntity;
+import jnpf.warehouse.service.WareHouseService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -103,6 +107,10 @@ public class ReceiptoutController {
     private VehicleService vehicleService;
     @Autowired
     private MaterialService materialService;
+    @Autowired
+    private ReservoirareaService reservoirareaService;
+    @Autowired
+    private WareHouseService wareHouseService;
 
     /**
      * 销售订单出货，出库单创建
@@ -395,14 +403,30 @@ public class ReceiptoutController {
     //子表
 		List<Receiptout_item0Entity> Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
 		for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){
+		    if (StringUtils.isNotEmpty(receiptout_item0Entity.getVehicleId())) {
                 VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId());
-		    if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
+                if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())) {
                     receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno());
                 }
+            }
+		    if (StringUtils.isNotEmpty(receiptout_item0Entity.getMaterialId())) {
                 MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId());
-		    if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
+                if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
                     receiptout_item0Entity.setMaterialName(materialEntity.getItemName());
                 }
+            }
+            if(StringUtils.isNotEmpty(receiptout_item0Entity.getReservoirareaId())){
+                ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptout_item0Entity.getReservoirareaId());
+                if(reservoirareaEntity != null){
+                    receiptout_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());
+                }
+            }
+            if(StringUtils.isNotEmpty(receiptout_item0Entity.getWarehouseId())){
+                WareHouseEntity wareHouseEntity = wareHouseService.getById(receiptout_item0Entity.getWarehouseId());
+                if(wareHouseEntity != null){
+                    receiptout_item0Entity.setWarehouseName(wareHouseEntity.getName());
+                }
+            }
         }
 		vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class ));
     //副表

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java

@@ -129,4 +129,9 @@ public class Receiptout_item0Entity  {
     @TableField(exist = false)
     private String areaName;
 
+    @TableField(exist = false)
+    private String reservoirareaName;
+    @TableField(exist = false)
+    private String warehouseName;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java

@@ -1,5 +1,6 @@
 package jnpf.receiptout.model.receiptout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -72,6 +73,11 @@ public class Receiptout_item0Model  {
     @JsonProperty("materialName")
     private String materialName;
 
+    @TableField("reservoirareaName")
+    private String reservoirareaName;
+    @TableField("warehouseName")
+    private String warehouseName;
+
 
 
 }

SC-web/src/views/scm/basicInformation/collection/Detail.vue

@@ -13,21 +13,27 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户名称" prop="customerId">
-              <popupSelect v-model="dataForm.customerId" placeholder="请选择" clearable field="customerId"
+<!--              <popupSelect v-model="dataForm.customerId" placeholder="请选择" clearable field="customerId"
                 interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="id"
                 relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
                 @change="popupSelect" disabled>
-              </popupSelect>
+              </popupSelect>-->
+              <el-input v-model="dataForm.customerNm" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+
+              </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="合同名称" prop="contractId">
-              <popupSelect v-model="dataForm.contractId" placeholder="请选择" clearable field="contractId"
+<!--              <popupSelect v-model="dataForm.contractId" placeholder="请选择" clearable field="contractId"
                            interfaceId="399835312982972805" :bissId="dataForm.customerId" :columnOptions="contractNamecolumnOptions" propsValue="id"
                            relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="contractSelect" disabled
                            >
-              </popupSelect>
+              </popupSelect>-->
+              <el-input v-model="dataForm.contractNm" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -137,24 +143,28 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" width="130">
+                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" width="200">
                         <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.salesorderId" placeholder="请选择" clearable
+<!--                          <popupSelect v-model="scope.row.salesorderId" placeholder="请选择" clearable
                             :field="'salesorderId'+scope.$index" interfaceId="399077559599480261"
                             :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="id"
                             relationField="document_no" popupType="dialog" popupWidth="800px"
                              @change="popupSelect2" disabled>
-                          </popupSelect>
+                          </popupSelect>-->
+                          <el-input v-model="scope.row.sourceName" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="contractId" label="合同编号"  align="center" width="130">
+                      <el-table-column prop="contractId" label="合同编号"  align="center" width="200">
                         <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.contractId" placeholder="请选择" clearable
+<!--                          <popupSelect v-model="scope.row.contractId" placeholder="请选择" clearable
                                        :field="'contractId'+scope.$index" interfaceId="398848549678332037"
                                        :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="id"
                                        relationField="contract_code" popupType="dialog" popupWidth="800px" disabled
                           >
-                          </popupSelect>
+                          </popupSelect>-->
+                          <el-input v-model="scope.row.contractCode" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="num" label="数量"  align="center" width="130">
@@ -190,7 +200,7 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="creatorTime" label="业务日期"  align="center" width="130">
+                      <el-table-column prop="creatorTime" label="业务日期"  align="center" width="160">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
                             :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>

SC-web/src/views/scm/basicInformation/collection/Form.vue

@@ -137,7 +137,7 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" width="130">
+                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" width="200">
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.salesorderId" placeholder="请选择" clearable
                             :field="'salesorderId'+scope.$index" interfaceId="393372436705378053"
@@ -147,7 +147,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="contractId" label="合同编号"  align="center" width="130">
+                      <el-table-column prop="contractId" label="合同编号"  align="center" width="200">
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.contractId" placeholder="请选择" clearable
                                        :field="'contractId'+scope.$index" interfaceId="398848549678332037"
@@ -190,7 +190,7 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="creatorTime" label="业务日期"  align="center" width="130">
+                      <el-table-column prop="creatorTime" label="业务日期"  align="center" width="160">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
                             :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>

SC-web/src/views/scm/basicInformation/receiptin/Form.vue

@@ -458,19 +458,19 @@
 		mounted() {},
 		methods: {
 			initData(reservoirarea) {
-				for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
+				for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
 					if (this.comIndex == 0) {
-						this.dataForm.receiptin_item0List.forEach((column, index) => {
+						this.dataForm.receiptout_item0List.forEach((column, index) => {
 							column.reservoirareaId = reservoirarea.id;
 							column.warehouseId = reservoirarea.houseId;
 							column.reservoirareaName = reservoirarea.areaname;
 							column.warehouseName = reservoirarea.houseName;
 						});
 					} else {
-						this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
-						this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+						this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
-						this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
-						this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+						this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
 					}
 				}
 			},

SC-web/src/views/scm/basicInformation/receiptout/Form.vue

@@ -151,6 +151,9 @@
                          popupWidth="800px" @change="areaSelect"
           >
           </popupSelect>
+<!--          <el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
+                    readonly @click.native="choiceReservoirareaId(scope.$index)">
+          </el-input>-->
         </template>
       </el-table-column>
       <el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
@@ -159,6 +162,9 @@
                          placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
                          popupWidth="800px" disabled>
           </popupSelect>
+<!--          <el-input v-model="scope.row.warehouseName" placeholder="选择仓库"
+                    readonly>
+          </el-input>-->
         </template>
       </el-table-column>
       <el-table-column prop="batchNo" label="批次号" align="center" width="180">
@@ -241,17 +247,23 @@
         <el-button @click="visible = false"> 取 消</el-button>
         <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
+  <ReservoirareaBox v-if="formVisible" ref="form" @refreshDataList="initData" />
     </el-dialog>
 </template>
 <script>
     import request from '@/utils/request'
+    import ReservoirareaBox from './ReservoirareaBox'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     export default {
-        components: {},
+        components: {
+          ReservoirareaBox
+        },
         props: [],
         data() {
             return {
+                comIndex: -1,
+                formVisible: false,
                 submitDisabled: false,
                 visible: false,
                 loading: false,
@@ -311,6 +323,30 @@
         },
         mounted() {},
         methods: {
+          initData(reservoirarea) {
+            for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
+              if (this.comIndex == 0) {
+                this.dataForm.receiptin_item0List.forEach((column, index) => {
+                  column.reservoirareaId = reservoirarea.id;
+                  column.warehouseId = reservoirarea.houseId;
+                  column.reservoirareaName = reservoirarea.areaname;
+                  column.warehouseName = reservoirarea.houseName;
+                });
+              } else {
+                this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+                this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+                this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+                this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+              }
+            }
+          },
+          choiceReservoirareaId(index) {
+            this.comIndex = index;
+            this.formVisible = true
+            this.$nextTick(() => {
+              this.$refs.form.init()
+            })
+          },
           areaSelect(a,b){
             for (let i = 0;i<this.dataForm.receiptout_item0List.length;i++) {
               if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {