1.银行接口-跌价补货(已完成)

2.出、入库收款明细列表操作bug修改（已完成）
2022年7月20日15点36分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/CcbController.java

@@ -186,15 +186,4 @@ public class CcbController {
         return ccbHttpService.queryAssets(assets);
     }
 
-    /**
-     * 移库请求
-     *
-     * @param moveCargo 报文
-     * @return 结果
-     */
-    @PostMapping("/moveCargoReq")
-    public MoveCargoR moveCargoReq(@RequestBody MoveCargo moveCargo) {
-        return ccbHttpService.moveCargoReq(moveCargo);
-    }
-
 }

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/CcbHttpService.java

@@ -126,10 +126,4 @@ public interface CcbHttpService {
      */
     ReplenishmentR cargosRF(Replenishment replenishment);
 
-    /**
-     * 移库请求
-     * @param moveCargo 报文
-     * @return  结果
-     */
-    MoveCargoR moveCargoReq(MoveCargo moveCargo);
 }

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/impl/CcbHttpServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.ccb.domain.basic.SyncedOrg;
 import com.ruoyi.ccb.service.CcbHttpService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import com.ruoyi.warehouseBusiness.service.IWarehouseBillsCcbService;
 import lombok.AllArgsConstructor;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -211,7 +213,7 @@ public class CcbHttpServiceImpl implements CcbHttpService {
                 .map(CargoDetail::getTakeVoucher)
                 .collect(Collectors.toList());
 
-        AjaxResult result = ccbService.unlockStock(billNoList, true);
+        AjaxResult result = ccbService.lockStock(pledge.getUserName(), billNoList, true);
 
         PledgeR pledgeR = new PledgeR();
         pledgeR.setUserName(pledge.getUserName());
@@ -504,24 +506,97 @@ public class CcbHttpServiceImpl implements CcbHttpService {
 
     /**
      * 跌价补货
-     * @param replenishment  报文
-     * @return  结果
+     *
+     * @param replenishment 报文
+     * @return 结果
      */
     @Override
     public ReplenishmentR cargosRF(Replenishment replenishment) {
 
-        return null;
-    }
+        //获取补货清单
+        List<CargoDetail> cargos = replenishment.getCargos();
+
+        //补货之后清单
+        List<CargoDetail> newCargos = new ArrayList<>();
+
+        //补货返回
+        ReplenishmentR replenishmentR = new ReplenishmentR();
+
+        replenishmentR.setUserName(replenishment.getUserName());
+        replenishmentR.setUscc(replenishment.getUscc());
+        replenishmentR.setNewUserName(replenishment.getNewUserName());
+        replenishmentR.setNewUserNameUSCC(replenishment.getNewUserNameUSCC());
+        replenishmentR.setReqUser(replenishment.getReqUser());
+
+        //判断补货清单是否为空
+        if (ObjectUtil.isNotNull(cargos)) {
+            int count = 0;
+            //遍历补货清单，开始补货
+            for (CargoDetail cargoDetail : cargos) {
+                TWhgenleg stock = new TWhgenleg();
+                stock.setLockStatus(1);
+                stock.setfOriginalbillno(cargoDetail.getTakeVoucher());
+                stock.setUnlockTime(new Date());
+                stock.setBelongTo(replenishment.getNewUserName());
+                stock.setWrNumber(cargoDetail.getTakeVoucher());
+                int re = ccbService.cargosRF(stock, replenishment.getUserName());
+                if (re == 2) {
+                    count++;
+                }
 
-    /**
-     * 移库请求
-     * @param moveCargo 报文
-     * @return  结果
-     */
-    @Override
-    public MoveCargoR moveCargoReq(MoveCargo moveCargo) {
+            }
+            //判断是否全部补货成功
+            if (count == cargos.size()) {
+                replenishmentR.setResult("Y");
+                //通过补货清单中保管凭证号查询补货之后清单数据
+                // 库存帐查询
+                List<Map<String, Object>> stockList = ccbService.getStockList(cargos.get(0).getTakeVoucher(), replenishment.getUserName());
+                stockList.forEach(map -> {
+                    String temp = JSON.toJSONString(map);
+
+                    //获取清单数据
+                    CargoDetail detail = JSON.parseObject(temp, CargoDetail.class);
+                    detail.setNumberUnit("件");
+                    detail.setWeightUnit("千克");
+                    detail.setCargoBelong(replenishment.getUserName());
+                    detail.setInStorageNumber(detail.getTakeVoucher());
+                    detail.setRemainNumber(detail.getNumberLeft());
+                    detail.setRemainWeight(detail.getWeightLeft());
+                    detail.setElectronicTags(ccbService.getLabel(detail.getTakeVoucher()));
+
+                    JSONObject object = JSON.parseObject(temp);
+                    //判断状态锁
+                    if (!"0".equals(object.getString("lockStatus"))) {
+                        CargoLockInfo lockInfo = new CargoLockInfo();
+                        lockInfo.setCargoNo(detail.getCargoNo());
+                        lockInfo.setBlNumber(detail.getBlNumber());
+                        lockInfo.setCargoBelong(detail.getCargoBelong());
+                        lockInfo.setTakeVoucher(detail.getTakeVoucher());
+                        lockInfo.setNumber(detail.getNumberLeft());
+                        lockInfo.setNumberUnit(detail.getNumberUnit());
+                        lockInfo.setWeight(detail.getWeightLeft());
+                        lockInfo.setWeightUnit(detail.getWeightUnit());
+                        lockInfo.setSpeci(detail.getSpeci());
+                        lockInfo.setReasonCode("PLGL");
+                        lockInfo.setLockTime(object.getDate("lockTime"));
+                        lockInfo.setWrNumber(detail.getWrNumber());
+                        lockInfo.setElectronicTags(detail.getElectronicTags());
+                        detail.setLockInfo(lockInfo);
+                    }
+                    newCargos.add(detail);
+                });
+                replenishmentR.setCargos(newCargos);
+            } else {//补货未成功返回
+                replenishmentR.setResult("N");
+                replenishmentR.setReason("跌价补货部分成功");
+            }
+
+        } else {//补货货物清单为空返回
+            replenishmentR.setResult("N");
+            replenishmentR.setReason("跌价补货的货物清单为空");
+        }
 
-        return null;
+        return replenishmentR;
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -800,11 +800,13 @@ public class TFeeServiceImpl implements ITFeeService {
             Date time = new Date();
             String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
             tFee.setfBillno(billNo);
+            tFee.setfApplyMoney(tFee.getfAmtcr());
             tFeeMapper.insertTFee(tFee);
         } else {
             tFee.setUpdateBy(loginUser.getUser().getUserName());
             tFee.setUpdateTime(new Date());
             tFee.setfBillstatus(billstatus);
+            tFee.setfApplyMoney(tFee.getfAmtcr());
             tFeeMapper.updateTFee(tFee);
         }
         // 删除从表

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -278,6 +278,8 @@ public class TWhgenleg extends BaseEntity {
     private String timeStartBsdate;
     private String timeEndBsdate;
 
+
+
     public String getfEmsSeqNo() {
         return fEmsSeqNo;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/IWarehouseBillsCcbService.java

@@ -100,4 +100,12 @@ public interface IWarehouseBillsCcbService {
      * @return
      */
     List<Map<String, Object>> selectQueryAssets(String blNumber, String userName, String wrNumber, String cargoType);
+
+    /**
+     * 跌价补货-修改仓单编号以及质押归属人
+     * @param stock   修改信息
+     * @param userName  客户
+     * @return  结果
+     */
+    int cargosRF(TWhgenleg stock, String userName);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/WarehouseBillsCcbServiceImpl.java

@@ -296,4 +296,18 @@ public class WarehouseBillsCcbServiceImpl implements IWarehouseBillsCcbService {
         }
         return stockMapper.selectQueryAssets(blNumber, corp.getfId(),wrNumber,cargoType);
     }
+
+    /**
+     * 跌价补货-修改仓单编号以及质押归属人
+     * @param stock   修改信息
+     * @param userName  客户
+     * @return  结果
+     */
+    @Override
+    public int cargosRF(TWhgenleg stock, String userName) {
+        // 获取客户信息
+        TCorps corp = corpMapper.getCorpByName(userName);
+        stock.setfCorpid(corp.getfId());
+        return stockMapper.changeBelongTo(stock);
+    }
 }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -1396,7 +1396,7 @@
     </select>
 
     <select id="selectStockList" resultType="Map">
-        select
+        select DISTINCT
                t3.dict_label as cargoType,
                t2.f_no as cargoNo,
                t2.f_name as cargoName,
@@ -1565,6 +1565,7 @@
             <if test="lockTime != null">lock_time = #{lockTime},</if>
             <if test="unlockTime != null">unlock_time = #{unlockTime},</if>
             <if test="wrNumber != null">wr_number = #{wrNumber},</if>
+            <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
         </trim>
         where f_originalbillno = #{fOriginalbillno}
     </update>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -1144,13 +1144,12 @@
         CONCAT( tw.f_taxrate, '%' )
         END AS f_taxratestr,
         tw.f_dc AS fDc,
-        tw.f_billstatus AS fDillstatus,
+        tw.f_billstatus AS fBillstatus,
         tw.f_review_date AS fReviewDate,
         tw.f_statement_no AS fStatementNo,
         tw.f_accamount AS fAccamount,
         tw.f_stlamount AS fStlamount,
         tw.f_accamount_date AS fAccamountDate,
-
         tw.f_stlamount_no AS fStlamountNo,
         tw.f_askamount AS fAskamount,
         tw.f_status AS f_status,