[CODE]: 小程序提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/AppletsController.java

@@ -1,11 +1,14 @@
 package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
@@ -41,7 +44,7 @@ public class AppletsController extends BaseController {
      *  入库数量
      */
     @GetMapping("/inStockList")
-    public TableDataInfo inList(@RequestBody TWarehousebillsitems tWarehousebillsitems) {
+    public TableDataInfo inList(TWarehousebillsitems tWarehousebillsitems) {
         startPage();
         tWarehousebillsitems.setfBilltype("SJRK");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehousebillsitems);
@@ -52,7 +55,7 @@ public class AppletsController extends BaseController {
      *  出库数量
      */
     @GetMapping("/outStockList")
-    public TableDataInfo outList(@RequestBody TWarehousebillsitems tWarehousebillsitems) {
+    public TableDataInfo outList( TWarehousebillsitems tWarehousebillsitems) {
         startPage();
         tWarehousebillsitems.setfBilltype("SJCK");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehousebillsitems);
@@ -74,8 +77,13 @@ public class AppletsController extends BaseController {
      */
     @PostMapping(value = "/addCredit")
     @RepeatSubmit
-    public AjaxResult addCredit( @RequestParam("tEnclosure") String tEnclosure,
-                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
+    public AjaxResult addCredit( @RequestBody String information) {
+        if (StringUtils.isEmpty(information)) {
+            return AjaxResult.error("未找到查询条件，请确认");
+        }
+        JSONObject jsonObject = JSONArray.parseObject(information);
+        String tEnclosure = jsonObject.get("tEnclosure").toString();
+        String warehousebillsitems = jsonObject.get("warehousebillsitems").toString();
         String billsType = "SJRK";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
@@ -87,9 +95,14 @@ public class AppletsController extends BaseController {
      */
     @PostMapping(value = "/outAddCredit")
     @RepeatSubmit
-    public AjaxResult outAddCredit( @RequestParam("tEnclosure") String tEnclosure,
-                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "SJRCK";
+    public AjaxResult outAddCredit( @RequestBody String information) {
+        if (StringUtils.isEmpty(information)) {
+            return AjaxResult.error("未找到查询条件，请确认");
+        }
+        JSONObject jsonObject = JSONArray.parseObject(information);
+        String tEnclosure = jsonObject.get("tEnclosure").toString();
+        String warehousebillsitems = jsonObject.get("warehousebillsitems").toString();
+        String billsType = "SJCK";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.addCreditItems(tEnclosure,warehousebillsitems,billsType,loginUser);

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

@@ -197,6 +197,6 @@ public interface ITWarehouseBillsService {
 
     AjaxResult waitWarehousingItems(TWarehousebillsitems tWarehousebillsitems);
 
-    AjaxResult addCreditItems(String tEnclosure ,String  tWarehousebillsitems, String billsType,LoginUser loginUser);
+    AjaxResult addCreditItems(String tEnclosure , String  tWarehousebillsitems, String billsType, LoginUser loginUser);
 
 }

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

@@ -885,48 +885,53 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Transactional
     public AjaxResult addCreditItems(String tEnclosure ,String  tWarehousebillsitems, String billsType,LoginUser loginUser) {
         TWarehouseBills tWarehouseBills =new TWarehouseBills();
-        JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
-        List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
+        TWarehousebillsitems warehousebillsitemsList=JSONArray.parseObject(tWarehousebillsitems, TWarehousebillsitems.class);
         if(billsType.equals("SJRK")){
-            for(TWarehousebillsitems item : warehousebillsitemsList){
+            if(null!=warehousebillsitemsList){
                 // 先查询是否已经处理
-                TWarehousebillsitems tWarehousebillsitems1=tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(item.getfId());
+                TWarehousebillsitems tWarehousebillsitems1=tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(warehousebillsitemsList.getfId());
                 if(tWarehousebillsitems1.getfBillstatus().equals(40)){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("更新库存明细失败,该信息已操作,请重新加载");
                 }
                 // 查询主表
-                tWarehouseBills =  tWarehouseBillsMapper.selectTWarehousebillsById(item.getfPid());
+                tWarehouseBills =  tWarehouseBillsMapper.selectTWarehousebillsById(warehousebillsitemsList.getfPid());
+                // 明细原本数据
+                TWarehousebillsitems tWarehousebillsitems2 = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(warehousebillsitemsList.getfId());
                 // 查询库容量  是否可入库
-                int m = calculation(tWarehouseBills.getfWarehouseid(), item.getfGrossweight());
+                int m = calculation(tWarehouseBills.getfWarehouseid(), warehousebillsitemsList.getfGrossweight());
                 if (m == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("更新库存总账失败-->入库毛重大于库容");
                 }
-                item.setfBillingway(tWarehouseBills.getfBillingway());
-                item.setfChargedate(tWarehouseBills.getfChargedate());
-                TWhgenleg tWhgenle = queryTWhgenleg(tWarehouseBills, item);
+                warehousebillsitemsList.setfBillingway(tWarehouseBills.getfBillingway());
+                warehousebillsitemsList.setfChargedate(tWarehouseBills.getfChargedate());
+                TWhgenleg tWhgenle = queryTWhgenleg(tWarehouseBills, tWarehousebillsitems2);
                 if (StringUtils.isNotNull(tWhgenle)) {
-                    int i = updateTWhgenlegData(item, tWhgenle.getfId(), billsType);
+                    int i = updateTWhgenlegData(warehousebillsitemsList, tWhgenle.getfId(), billsType);
                     if (i <= 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("更新库存总账失败");
                     }
                 } else {
-                    if (instalTWhgenleg(tWarehouseBills, item, loginUser.getUser()) <= 0) {
+                    tWarehousebillsitems2.setfQty(warehousebillsitemsList.getfQty());
+                    tWarehousebillsitems2.setfGrossweight(warehousebillsitemsList.getfGrossweight());
+                    tWarehousebillsitems2.setfNetweight(warehousebillsitemsList.getfNetweight());
+                    if (instalTWhgenleg(tWarehouseBills, tWarehousebillsitems2, loginUser.getUser()) <= 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("新增库存总账失败");
                     }
                 }
-                item.setfIsInventory(0L);
+                warehousebillsitemsList.setfIsInventory(0L);
+                warehousebillsitemsList.setfSerialNumber(tWarehousebillsitems2.getfSerialNumber());
                 int num = 0;
-                if (StringUtils.isNotNull(item.getfId())) {
-                    item.setfBillstatus(40L);
-                    item.setUpdateBy(loginUser.getUser().getUserName());
-                    item.setUpdateTime(new Date());
-                    num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
+                if (StringUtils.isNotNull(warehousebillsitemsList.getfId())) {
+                    warehousebillsitemsList.setfBillstatus(40L);
+                    warehousebillsitemsList.setUpdateBy(loginUser.getUser().getUserName());
+                    warehousebillsitemsList.setUpdateTime(new Date());
+                    num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(warehousebillsitemsList);
                     // 添加状态log
-                    insertTWarehousebillsLog(item, 40L, loginUser);
+                    insertTWarehousebillsLog(warehousebillsitemsList, 40L, loginUser);
                 }
                 if (num <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -934,45 +939,51 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
             }
         }else {
-            for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
+            if(null!=warehousebillsitemsList){
                 // 先查询是否已经处理
-                TWarehousebillsitems tWarehousebillsitems1=tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wbItem.getfId());
+                TWarehousebillsitems tWarehousebillsitems1=tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(warehousebillsitemsList.getfId());
                 if(tWarehousebillsitems1.getfBillstatus().equals(40)){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("更新库存明细失败,该信息已操作,请重新加载");
                 }
+                // 查询主表
+                tWarehouseBills =  tWarehouseBillsMapper.selectTWarehousebillsById(warehousebillsitemsList.getfPid());
+                // 明细原本数据
+                TWarehousebillsitems tWarehousebillsitems2 = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(warehousebillsitemsList.getfId());
                 // 查询总账是否存在
-                TWhgenleg tWhgenle = queryTWhgenleg(tWarehouseBills, wbItem);
+                TWhgenleg tWhgenle = queryTWhgenleg(tWarehouseBills, tWarehousebillsitems2);
                 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细库存为空");
                 } else { // 非空修改库存总账
                     //  库存 <  出库件数
-                    if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {
+                    if (tWhgenle.getfQtyblc() < warehousebillsitemsList.getfQty()) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("库存明细库存不足");
                     }
                     // 更新库存总账
-                    updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
-                    if (StringUtils.isNull(tWarehouseBills.getfBsdate()) || StringUtils.isNull(wbItem.getfChargedate())) {
+                    warehousebillsitemsList.setfVolumn(tWarehousebillsitems2.getfVolumn());
+                    updateTWhgenlegData(warehousebillsitemsList, tWhgenle.getfId(), billsType);
+                    if (StringUtils.isNull(tWarehouseBills.getfBsdate()) ) {
                         return AjaxResult.error("库存明细请检查日期，操作终止");
                     }
                     if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
                         return AjaxResult.error("库存明细请检查客户信息，操作终止");
                     }
                 }
-                wbItem.setfBillstatus(40L);
+                warehousebillsitemsList.setfBillstatus(40L);
+                warehousebillsitemsList.setfSerialNumber(tWarehousebillsitems2.getfSerialNumber());
                 int num = 0;
-                wbItem.setfPid(tWarehouseBills.getfId());
-                wbItem.setfBilltype(billsType);
-                wbItem.setfBillno(tWarehouseBills.getfBillno());
-                wbItem.setfBsdate(tWarehouseBills.getfBsdate());
-                if (StringUtils.isNotNull(wbItem.getfId())) {
-                    wbItem.setUpdateBy(loginUser.getUser().getUserName());
-                    wbItem.setUpdateTime(new Date());
-                    num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
+                warehousebillsitemsList.setfPid(tWarehouseBills.getfId());
+                warehousebillsitemsList.setfBilltype(billsType);
+                warehousebillsitemsList.setfBillno(tWarehouseBills.getfBillno());
+                warehousebillsitemsList.setfBsdate(tWarehouseBills.getfBsdate());
+                if (StringUtils.isNotNull(warehousebillsitemsList.getfId())) {
+                    warehousebillsitemsList.setUpdateBy(loginUser.getUser().getUserName());
+                    warehousebillsitemsList.setUpdateTime(new Date());
+                    num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(warehousebillsitemsList);
                     // 添加状态log
-                    insertTWarehousebillsLog(wbItem, 40L, loginUser);
+                    insertTWarehousebillsLog(warehousebillsitemsList, 40L, loginUser);
                 }
                 if (num <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -497,10 +497,11 @@
         WHERE
             items.f_billtype = 'SJRK'
           AND items.f_billstatus IN ( 20, 30 )
-          <if test="timeStartBsdate != null">items.f_bsdate &gt;= #{timeStartBsdate},</if>
-          <if test="timeEndBsdate != null">items.f_bsdate &lt;= #{timeEndBsdate},</if>
-          <if test="fBillstatus != null">items.f_billstatus = #{fBillstatus},</if>
-          <if test="fMblno != null">items.f_mblno = #{fMblno},</if>
+          <if test="timeStartBsdate != null">AND items.f_bsdate &gt;= #{timeStartBsdate}</if>
+          <if test="timeEndBsdate != null">AND items.f_bsdate &lt;= #{timeEndBsdate}</if>
+          <if test="fBillstatus != null">AND items.f_billstatus = #{fBillstatus}</if>
+          <if test="fMblno != null and fMblno != '' ">AND items.f_mblno like concat('%',
+              #{fMblno},'%') </if>
     </select>
     <select id="selectWarehouseBusinesOutList" resultType="java.util.Map">
         SELECT
@@ -533,10 +534,10 @@
         WHERE
             items.f_billtype = 'SJCK'
           AND items.f_billstatus IN ( 20, 30 )
-        <if test="timeStartBsdate != null">items.f_bsdate &gt;= #{timeStartBsdate},</if>
-        <if test="timeEndBsdate != null">items.f_bsdate &lt;= #{timeEndBsdate},</if>
-        <if test="fBillstatus != null">items.f_billstatus = #{fBillstatus},</if>
-        <if test="fMblno != null">items.f_mblno = #{fMblno},</if>
+        <if test="timeStartBsdate != null">AND items.f_bsdate &gt;= #{timeStartBsdate}</if>
+        <if test="timeEndBsdate != null">AND items.f_bsdate &lt;= #{timeEndBsdate}</if>
+        <if test="fBillstatus != null">AND items.f_billstatus = #{fBillstatus}</if>
+        <if test="fMblno != null">AND items.f_mblno = #{fMblno}</if>
     </select>