1

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

@@ -172,6 +172,11 @@ public class CargoTitleDetails extends BaseModel<CargoTitleDetails> {
      */
     @TableField(exist = false)
     private List<CargoPositionDetails> cargoPositionDetailsList;
+    /**
+     * 货转入合同卖方
+     */
+    @TableField(exist = false)
+    private String contractSeller;
 
     @Override
     protected Serializable pkVal() {

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

@@ -181,6 +181,8 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                         stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
                         stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
+                        stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight()*cargoTitleDetails.getSalePrice());
+                        stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
                     }
                     //所选仓位库存不足
@@ -405,6 +407,9 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                 stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                 stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                 stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                stockPurchaseReceiptReport.setSettlementPrice(cargoTitleDetails.getAvgCost());
+                stockPurchaseReceiptReport.setAmountIngPayable(cargoTitleDetails.getAvgCost()*warehouseInOutInfo.getNetWeight());
+                stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.NOT_COLLECTION_PAY.getFlag());
                 stockPurchaseReceiptReport.setStatus(StatusEnum.NOT_COLLECTION_PAY.getName());
                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
@@ -417,10 +422,10 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
             warehousingOrder.setWarehouseName(cargoTitleDetails.getWarehouseName());
             warehousingOrder.setInType("货转");
             warehousingOrder.setGoodsName(cargoTitleDetails.getGoodsName());
-            warehousingOrder.setGoodsSource(cargoTitleDetails.getOutContractNo());
+            warehousingOrder.setGoodsSource(cargoTitleDetails.getContractSeller());
             warehousingOrder.setInWarehouseWeight(cargoTitleDetails.getTransferOutWeight());
             warehousingOrder.setAvgCost(cargoTitleDetails.getAvgCost());
-            warehousingOrder.setCustomer(cargoTitleDetails.getCustomer());
+            warehousingOrder.setCustomer(cargoTitleDetails.getContractSeller());
             warehousingOrder.setSurplusWeight(cargoTitleDetails.getTransferOutWeight());
             warehousingOrder.setAmountNotPayable(cargoTitleDetails.getAmountNotPayable());
             warehousingOrder.setGrainFund(cargoTitleDetails.getAmountNotPayable());

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

@@ -98,6 +98,7 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(transfer_out_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(out_contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(relation_receive_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
@@ -135,6 +136,7 @@
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(transfer_out_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(relation_receive_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(out_contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>