修改

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/StaffController.java

@@ -135,6 +135,9 @@ public class StaffController {
 	 */
 	@GetMapping("/query/getStaffListByCompIdAndWarehouseId")
 	public List<CommonStaff> getStaffListByCompId(String compId,String warehouseId) {
+		if(compId == null || compId.isEmpty()){
+			compId=AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
+		}
 		if(warehouseId != null && !warehouseId.isEmpty()){
 			WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseId);
 			String phones = warehouseBaseInfo.getOtherPersonPhone()!=null?warehouseBaseInfo.getPersonPhone()+","+warehouseBaseInfo.getOtherPersonPhone():warehouseBaseInfo.getPersonPhone();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockPurchaseReceiptReport.java

@@ -159,6 +159,16 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
      */
     @TableField(exist = false)
     private String poundImg;
+    /**
+     * 合同单价
+     */
+    @TableField(exist = false)
+    private Double price;
+    /**
+     * 货名
+     */
+    @TableField(exist = false)
+    private String goodsName;
 
     /**
      *补货结转对象

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -229,6 +229,11 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
     private List<DriverViewInfo> driverViewInfoList;
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
+    /**
+     * 随行就市价格
+     */
+    @TableField(exist = false)
+    private Float contractPrice;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -269,6 +269,11 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      */
     @TableField(exist = false)
     private String reviewer;
+    /**
+     * 价格类型(定价销售，随行就市)
+     */
+    @TableField(exist = false)
+    private String priceType;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -245,6 +245,13 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     @Override
     public StockPurchaseReceiptReport getInfo(String id) {
         StockPurchaseReceiptReport stockPurchaseReceiptReport=this.selectById(id);
+        ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+        .eq("contract_no",stockPurchaseReceiptReport.getContractNo())
+        .eq("comp_id",stockPurchaseReceiptReport.getCompId()));
+        //货物信息
+        ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo.getId()));
+        stockPurchaseReceiptReport.setPrice(contractManagementInfo.getUnitContractPrice());
+        stockPurchaseReceiptReport.setGoodsName(contractGoodsInfo.getGoodsName());
         return stockPurchaseReceiptReport;
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -145,6 +145,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     public TranProcessInfo getTranProcess(String id) {
         //查看运输信息
         TranProcessInfo tranProcessInfo = this.selectById(id);
+        TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
+        ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",tranProcessInfo.getContractNo())
+                .eq("comp_id",tranTaskInfo.getCompId()));
+        if (contractManagementInfo.getPriceType()!=null) {
+            tranProcessInfo.setPriceType(contractManagementInfo.getPriceType());
+        }
         //查看车次信息
         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                 .eq(TranCarInfo.QueryFiles.PROCESS_ID, id).eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0).orderBy("tran_car_no").orderBy("box_no"));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranSettlementReportMapper.xml

@@ -64,6 +64,7 @@
         phone,
         name as name,
         tran_car_no as tranCarNo,
+        tran_type_Key as tranTypeKey,
         car_no as carNo,
         card_no as cardNo,
         loading_weight as loadingWeight,