仓库app手持接口新增以及调试

2022年8月17日16时11分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/appHold/AppWarehouseController.java

@@ -75,7 +75,7 @@ public class AppWarehouseController extends BaseController {
                 appHoldTWarehouseBillsRVO.setFGrossweight(ls.getfGrossweight());//毛重
                 appHoldTWarehouseBillsRVO.setFMblno(ls.getfMblno());//提单号
                 appHoldTWarehouseBillsRVO.setFCorpid(ware.getfCorpid());//客户id
-                appHoldTWarehouseBillsRVO.setFName(itCorpsService.selectCorpsById(ware.getfGoodsid()) == null ? "无" : itCorpsService.selectCorpsById(ware.getfGoodsid()).getfName());//客户名称
+                appHoldTWarehouseBillsRVO.setFName(itCorpsService.selectCorpsById(ware.getfCorpid()) == null ? "无" : itCorpsService.selectCorpsById(ware.getfCorpid()).getfName());//客户名称
                 appHoldTWarehouseBillsRVO.setFNetweight(ls.getfNetweight());//净重
                 appHoldTWarehouseBillsRVO.setFGoodsid(ls.getfGoodsid());//货物id
                 appHoldTWarehouseBillsRVO.setGoodsName(itGoodsService.selectTGoodsById(ls.getfGoodsid()) == null ? "无" : itGoodsService.selectTGoodsById(ls.getfGoodsid()).getfName());//货物名称
@@ -128,7 +128,7 @@ public class AppWarehouseController extends BaseController {
                 appHoldTWarehouseBillsRVO.setFWarehouseInformation(tWarehousebillsitems.getfWarehouseInformation());
                 appHoldTWarehouseBillsRVO.setFGrossweight(tWarehousebillsitems.getfGrossweight());
                 appHoldTWarehouseBillsRVO.setFCorpid(tWarehouseBills.getfCorpid());//客户id
-                appHoldTWarehouseBillsRVO.setFName(itCorpsService.selectCorpsById(tWarehousebillsitems.getfGoodsid()) == null ? "无" : itCorpsService.selectCorpsById(tWarehousebillsitems.getfGoodsid()).getfName());
+                appHoldTWarehouseBillsRVO.setFName(itCorpsService.selectCorpsById(tWarehouseBills.getfCorpid()) == null ? "无" : itCorpsService.selectCorpsById(tWarehouseBills.getfCorpid()).getfName());
                 appHoldTWarehouseBillsRVO.setFNetweight(tWarehousebillsitems.getfNetweight());
                 appHoldTWarehouseBillsRVO.setFGoodsid(tWarehousebillsitems.getfGoodsid());//货物id
                 appHoldTWarehouseBillsRVO.setGoodsName(itGoodsService.selectTGoodsById(tWarehousebillsitems.getfGoodsid()) == null ? "无" : itGoodsService.selectTGoodsById(tWarehousebillsitems.getfGoodsid()).getfName());
@@ -216,19 +216,21 @@ public class AppWarehouseController extends BaseController {
         map.put("fMblno", fMblno);
         map.put("fMarks", fMarks);
         map.put("fOriginalbilldate", fOriginalbilldate);
-        Map<String, Object> wareMap = itWarehouseBillsService.selectWareIdAndItemId(map);
+        List<Map<String, Long>> wareMap = itWarehouseBillsService.selectWareIdAndItemId(map);
         if (ObjectUtil.isNotNull(wareMap)) {
             String[] arrs = fContent.split(",");
-            for (String arr : arrs) {
-                TWarehousebillsitemsElabel tWarehousebillsitemsElabel = new TWarehousebillsitemsElabel();
-                tWarehousebillsitemsElabel.setfPid((long) wareMap.get("itemId"));
-                tWarehousebillsitemsElabel.setfGPid((long) wareMap.get("fId"));
-                tWarehousebillsitemsElabel.setfType(1);
-                tWarehousebillsitemsElabel.setfStatus(0);
-                tWarehousebillsitemsElabel.setfContent(arr);
-                List<TWarehousebillsitemsElabel> tWarehousebillsitemsElabelList = labelService.selectItemsElabelList(tWarehousebillsitemsElabel);
-                if (ObjectUtil.isNotNull(tWarehousebillsitemsElabelList)) {
-                    return AjaxResult.error("标签号:" + fContent + "不在改单号里，请重新录入");
+            for (Map<String, Long> map1:wareMap) {
+                for (String arr : arrs) {
+                    TWarehousebillsitemsElabel tWarehousebillsitemsElabel = new TWarehousebillsitemsElabel();
+                    tWarehousebillsitemsElabel.setfPid(Long.valueOf(String.valueOf(map1.get("itemId"))));
+                    tWarehousebillsitemsElabel.setfGPid(Long.valueOf(String.valueOf(map1.get("fId"))));
+                    tWarehousebillsitemsElabel.setfType(1);
+                    tWarehousebillsitemsElabel.setfStatus(0);
+                    tWarehousebillsitemsElabel.setfContent(arr);
+                    List<TWarehousebillsitemsElabel> tWarehousebillsitemsElabelList = labelService.selectItemsElabelList(tWarehousebillsitemsElabel);
+                    if (ObjectUtil.isNull(tWarehousebillsitemsElabelList)) {
+                        return AjaxResult.error("标签号:" + fContent + "不在改单号里，请重新录入");
+                    }
                 }
             }
         } else {

ruoyi-plugin/src/main/java/com/ruoyi/ccb/domain/DevicesByStorage.java

@@ -14,8 +14,13 @@ public class DevicesByStorage {
     private String deviceLocationCode;
 
     /**
-     * 分页数据
+     * 单页大小
      */
-    private Devices page;
+    private Integer pageSize;
+
+    /**
+     * 当前页码
+     */
+    private Integer pageNo;
 
 }

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

@@ -656,18 +656,18 @@ public class CcbHttpServiceImpl implements CcbHttpService {
      */
     @Override
     public Devices findDevicesByStorage(DevicesByStorage devicesByStorage) {
-        if (ObjectUtil.isNull(devicesByStorage.getPage().getPageNo())){
-            devicesByStorage.getPage().setPageNo(1);
+        if (ObjectUtil.isNull(devicesByStorage.getPageNo())){
+            devicesByStorage.setPageNo(1);
         }
-        if (ObjectUtil.isNull(devicesByStorage.getPage().getPageSize())){
-            devicesByStorage.getPage().setPageSize(10);
+        if (ObjectUtil.isNull(devicesByStorage.getPageSize())){
+            devicesByStorage.setPageSize(10);
         }
         List<DeviceDetail> devicesDetailList = DeviceDetail.date();
         List<DeviceDetail> deviceDetails = devicesDetailList.stream().filter(item -> item.getDeviceLocationCode().equals(devicesByStorage.getDeviceLocationCode())).collect(Collectors.toList());
         Devices devices = new Devices();
         devices.setContent(deviceDetails);
-        devices.setPageNo(devicesByStorage.getPage().getPageNo());
-        devices.setPageSize(devicesByStorage.getPage().getPageSize());
+        devices.setPageNo(devicesByStorage.getPageNo());
+        devices.setPageSize(devicesByStorage.getPageSize());
         devices.setTotalRecords((long) deviceDetails.size());
         return devices;
     }

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

@@ -836,15 +836,19 @@ public class TFeeServiceImpl implements ITFeeService {
                 tFeeDoMapper.insertTFeeDo(tFeeDo);
             }
         }
-        // 点击对账、收费、付费提交审核时去掉费用
-        if (actId >= 210L && actId <= 230L) {
-            AjaxResult ajaxResult = this.billsfeesFollow(tFee.getfId());
-            String code = ajaxResult.get("code").toString();
-            if ("500".equals(code)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return ajaxResult;
+
+        if (isApprove) {
+            // 点击对账、收费、付费提交审核时去掉费用
+            if (actId >= 210L && actId <= 230L) {
+                AjaxResult ajaxResult = this.billsfeesFollow(tFee.getfId());
+                String code = ajaxResult.get("code").toString();
+                if ("500".equals(code)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return ajaxResult;
+                }
             }
         }
+
         //凯和收费提交审核时去掉钱
         if (actId >= 430 && actId <= 450) {
             //判断明细客户是否为同一个
@@ -1879,9 +1883,11 @@ public class TFeeServiceImpl implements ITFeeService {
             map.put("message", "费用明细数据有误,请找管理员");
         } else if ("DZ".equals(type) || "KHDZ".equals(type)) {
             BigDecimal subtract = amount.subtract(accamount);
-            if (subtract.compareTo(money) < 0) {
-                flag = false;
-                map.put("message", "提单号" + bills.getfMblno() + "的" + tFees.getfName() + "对账金额超过可对账金额,当前可对账金额为" + subtract + "元");
+            if(subtract.compareTo(new BigDecimal(0)) == 0){
+                if (subtract.compareTo(money) <= 0) {
+                    flag = false;
+                    map.put("message", "提单号" + bills.getfMblno() + "的" + tFees.getfName() + "对账金额超过可对账金额,当前可对账金额为" + subtract + "元");
+                }
             }
         } else if ("SF".equals(type) || "KHSF".equals(type)) {
             BigDecimal subtract = amount.subtract(stlamount);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -335,5 +335,5 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @param map
      * @return
      */
-    Map<String, Object> selectWareIdAndItemId(Map<String, Object> map);
+    List<Map<String, Long>> selectWareIdAndItemId(Map<String, Object> map);
 }

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

@@ -914,5 +914,5 @@ public interface ITWarehouseBillsService {
      * @param map
      * @return
      */
-    Map<String, Object> selectWareIdAndItemId(Map<String, Object> map);
+    List<Map<String, Long>> selectWareIdAndItemId(Map<String, Object> map);
 }

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

@@ -9876,7 +9876,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @return
      */
     @Override
-    public Map<String, Object> selectWareIdAndItemId(Map<String, Object> map) {
+    public  List<Map<String, Long>> selectWareIdAndItemId(Map<String, Object> map) {
         return tWarehouseBillsMapper.selectWareIdAndItemId(map);
     }
 

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

@@ -818,7 +818,13 @@
             DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,
             DATE_FORMAT( leg.f_originalbilldate, '%Y-%m-%d' ) AS fOriginalbilldate,
             leg.f_cntrno AS fCntrno,
-            leg.f_localcntrno fLocalcntrno
+            leg.f_localcntrno fLocalcntrno,
+        leg.lock_status As lockStatus,
+        leg.belong_to As belongTo,
+        leg.lock_time As lockTime,
+        leg.unlock_time As unlockTime,
+        leg.wr_number As wrNumber
+
         FROM
             t_whgenleg leg
             left join sys_user u on leg.create_by = u.user_name

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

@@ -226,6 +226,7 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fNewTrademodeid != null ">and f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
+        ORDER BY ware.create_time desc
         ${params.dataScope}
     </select>
 
@@ -3520,6 +3521,7 @@
             ware.del_flag = 0
           AND item.del_flag = 0
           AND sdd.dict_type = 'storage_type'
+        AND item.f_billtype = 'SJRK'
         <if test="fCorpid != null ">AND ware.f_corpid = #{fCorpid}</if>
         <if test="fMblno != null and fMblno != ''">AND item.f_mblno = #{fMblno}</if>
         <if test="fOriginalbilldate != null ">AND item.f_originalbilldate = date_format(#{fOriginalbilldate},'%Y-%m-%d')</if>

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

@@ -179,6 +179,7 @@
             tw.del_flag = '0'
           AND ware.del_flag = '0'
           AND te.f_status = 0
-        <if test="fContent != null and fContent != ''">and te.f_content like concat('%', #{fContent}, '%')</if>
+        <if test="labelCode != null and labelCode != ''">and te.f_content like concat('%', #{labelCode}, '%')</if>
+        ORDER BY te.create_time desc
     </select>
 </mapper>