Browse Source

道和银行接口 生成仓单号接口修改
2022年7月28日18点50分

纪新园 3 years ago
parent
commit
e055cb6bb7

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

@@ -213,9 +213,10 @@ public class CcbHttpServiceImpl implements CcbHttpService {
 
 
     @Override
     @Override
     public PledgeR generateWrNumber(Pledge pledge) {
     public PledgeR generateWrNumber(Pledge pledge) {
+        System.out.println(pledge);
         List<CargoDetail> cargos = pledge.getCargos();
         List<CargoDetail> cargos = pledge.getCargos();
         List<String> billNoList = cargos.stream()
         List<String> billNoList = cargos.stream()
-                .map(CargoDetail::getTakeVoucher)
+                .map(CargoDetail::getBlNumber)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
 
 
         AjaxResult result = ccbService.lockStock(pledge.getUserName(), billNoList, true);
         AjaxResult result = ccbService.lockStock(pledge.getUserName(), billNoList, true);
@@ -230,7 +231,7 @@ public class CcbHttpServiceImpl implements CcbHttpService {
             pledgeR.setReason((String) result.get("msg"));
             pledgeR.setReason((String) result.get("msg"));
         } else {
         } else {
             pledgeR.setResult("Y");
             pledgeR.setResult("Y");
-            cargos.forEach(cargo -> cargo.setWrNumber(cargo.getTakeVoucher()));
+            cargos.forEach(cargo -> cargo.setWrNumber(cargo.getBlNumber()));
         }
         }
         pledgeR.setCargos(cargos);
         pledgeR.setCargos(cargos);
         return pledgeR;
         return pledgeR;

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

@@ -65,7 +65,7 @@ public class WarehouseBillsCcbServiceImpl implements IWarehouseBillsCcbService {
                 return AjaxResult.error("客户不存在!");
                 return AjaxResult.error("客户不存在!");
             }
             }
 
 
-            TGoods goods = goodsMapper.getGoodsByName(item.getCargoName());
+            TGoods goods = goodsMapper.getGoodsByNo(item.getCargoNo());
             TGoods goods1 = new TGoods();
             TGoods goods1 = new TGoods();
             if (ObjectUtil.isNull(goods)) {
             if (ObjectUtil.isNull(goods)) {
 //                String[] arr = item.getCargoName().split(":");
 //                String[] arr = item.getCargoName().split(":");

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

@@ -1567,7 +1567,7 @@
             <if test="wrNumber != null">wr_number = #{wrNumber},</if>
             <if test="wrNumber != null">wr_number = #{wrNumber},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
         </trim>
         </trim>
-        where f_originalbillno = #{fOriginalbillno}
+        where f_mblno = #{fOriginalbillno}
     </update>
     </update>
 
 
 </mapper>
 </mapper>