1

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

@@ -158,7 +158,7 @@ public class CargoTitleDetails extends BaseModel<CargoTitleDetails> {
     @TableField(exist = false)
     private Date endDate;
     /**
-     * 查询类型(1转入2转出)
+     * 查询类型(1转出2转入)
      */
     @TableField(exist = false)
     private String searchType;

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

@@ -341,7 +341,13 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                     .eq("comp_id",cargoTitleDetails.getCompId())
                     .eq("contract_no",cargoTitleDetails.getRedeemContractNo()));
             if (contractManagementInfo!=null){
-                contractManagementInfo.setRedeemed(contractManagementInfo.getRedeemed()+cargoTitleDetails.getTransferOutWeight());
+                //本次赎回大于待赎回时 全部赎回
+                if (cargoTitleDetails.getTransferOutWeight()>(contractManagementInfo.getExpectedRedemption()-contractManagementInfo.getRedeemed())){
+                    contractManagementInfo.setRedeemed(contractManagementInfo.getExpectedRedemption());
+                }
+                else {
+                    contractManagementInfo.setRedeemed(contractManagementInfo.getRedeemed() + cargoTitleDetails.getTransferOutWeight());
+                }
                 contractManagementInfoService.updateById(contractManagementInfo);
             }
         }
@@ -402,24 +408,24 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.NOT_COLLECTION_PAY.getFlag());
                 stockPurchaseReceiptReport.setStatus(StatusEnum.NOT_COLLECTION_PAY.getName());
                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
-                WarehousingOrder warehousingOrder = new WarehousingOrder();
-                warehousingOrder.setId(IdGenerator.generateUUID());
-                warehousingOrder.setCompId(cargoTitleDetails.getCompId());
-                warehousingOrder.setBaseId(cargoTitleDetails.getBaseId());
-                warehousingOrder.setContractNo(cargoTitleDetails.getOutContractNo());
-                warehousingOrder.setWarehouseName(cargoTitleDetails.getWarehouseName());
-                warehousingOrder.setInType("货转");
-                warehousingOrder.setGoodsName(cargoTitleDetails.getGoodsName());
-                warehousingOrder.setGoodsSource(cargoTitleDetails.getOutContractNo());
-                warehousingOrder.setInWarehouseWeight(cargoTitleDetails.getTransferOutWeight());
-                warehousingOrder.setAvgCost(cargoTitleDetails.getAvgCost());
-                warehousingOrder.setCustomer(cargoTitleDetails.getCustomer());
-                warehousingOrder.setSurplusWeight(cargoTitleDetails.getTransferOutWeight());
-                warehousingOrder.setAmountNotPayable(cargoTitleDetails.getAmountNotPayable());
-                warehousingOrder.setGrainFund(cargoTitleDetails.getAmountNotPayable());
-                warehousingOrder.setIssuingTime(new Date());
-                warehousingOrderService.insert(warehousingOrder);
             }
+            WarehousingOrder warehousingOrder = new WarehousingOrder();
+            warehousingOrder.setId(IdGenerator.generateUUID());
+            warehousingOrder.setCompId(cargoTitleDetails.getCompId());
+            warehousingOrder.setBaseId(cargoTitleDetails.getBaseId());
+            warehousingOrder.setContractNo(cargoTitleDetails.getOutContractNo());
+            warehousingOrder.setWarehouseName(cargoTitleDetails.getWarehouseName());
+            warehousingOrder.setInType("货转");
+            warehousingOrder.setGoodsName(cargoTitleDetails.getGoodsName());
+            warehousingOrder.setGoodsSource(cargoTitleDetails.getOutContractNo());
+            warehousingOrder.setInWarehouseWeight(cargoTitleDetails.getTransferOutWeight());
+            warehousingOrder.setAvgCost(cargoTitleDetails.getAvgCost());
+            warehousingOrder.setCustomer(cargoTitleDetails.getCustomer());
+            warehousingOrder.setSurplusWeight(cargoTitleDetails.getTransferOutWeight());
+            warehousingOrder.setAmountNotPayable(cargoTitleDetails.getAmountNotPayable());
+            warehousingOrder.setGrainFund(cargoTitleDetails.getAmountNotPayable());
+            warehousingOrder.setIssuingTime(new Date());
+            warehousingOrderService.insert(warehousingOrder);
         }
         this.insert(cargoTitleDetails);
         return "ok";

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

@@ -11,10 +11,10 @@
         and delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND transfer_flag='2'
+                AND transfer_flag='1'
             </if>
             <if test="searchType == 2">
-                AND transfer_flag='1'
+                AND transfer_flag='2'
             </if>
         </if>
         <if test="startDate != null">
@@ -44,10 +44,11 @@
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
         amount_not_payable as amountNotPayable,
-        receive_comp_name asreceive_comp_name,
+        receive_comp_name as receiveCompName,
         transfer_out_weight as transferOutWeight,
         avg_cost as avgCost,
         sale_price as salePrice,
+        create_date as createDate,
         update_date as updateDate
         FROM cargo_title_details
         WHERE
@@ -55,10 +56,10 @@
         and delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND transfer_flag='2'
+                AND transfer_flag='1'
             </if>
             <if test="searchType == 2">
-                AND transfer_flag='1'
+                AND transfer_flag='2'
             </if>
         </if>
         <if test="startDate != null">

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

@@ -1625,7 +1625,7 @@
         </if>
         <if test = "searchKeyWord != null and searchKeyWord != ''" >
             AND ( lower( contract_no ) LIKE lower( CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( receivingCompany ) LIKE lower( CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( receiving_company ) LIKE lower( CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
     <select id="getRedeemedListByCondition"  parameterType="Map"
@@ -1670,7 +1670,7 @@
         </if>
         <if test = "searchKeyWord != null and searchKeyWord != ''" >
             AND ( lower( contract_no ) LIKE lower( CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( receivingCompany ) LIKE lower( CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( receiving_company ) LIKE lower( CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY signing_date DESC
         <if test="currentPage != null and currentPage != ''">