安品APP查看审批修改,采购 入库 出库 销售 撤销修改接单状态判断当月是否结账

ruoyi-admin/src/main/java/com/ruoyi/web/controller/anpin/StockControl.java

@@ -234,14 +234,6 @@ public class StockControl extends BaseController {
         if (tWarehouseBills.getfId() == null){
             return AjaxResult.error("数据不能为空");
         }
-        int result = tWarehousebillsService.derecognition(tWarehouseBills.getfId());
-        if(result == 1){
-            return AjaxResult.error("撤销请核失败，财务已对账");
-        } else if (result == 2){
-            return AjaxResult.error("撤销请核失败，财务已收费");
-        } else if (result == 3){
-            return AjaxResult.error("撤销请核失败，财务已付费");
-        }
         String billsType = null;
         if (StringUtils.isNotEmpty(tWarehouseBills.getfBilltype())&& "RK".equals(tWarehouseBills.getfBilltype())){
             billsType = "RKRevoke";

ruoyi-anpin/src/main/java/com/ruoyi/anpin/service/impl/TMonthEndingClosingServiceImpl.java

@@ -131,6 +131,7 @@ public class TMonthEndingClosingServiceImpl implements ITMonthEndingClosingServi
             list.add(end);
             //查询入库数据
             TWarehouseBills tWarehouseBills = new TWarehouseBills();
+            tWarehouseBills.setfBillstatus(7L);
             tWarehouseBills.setfBilltype("RK");
             tWarehouseBills.settimeInterval(list);
             List<TWarehouseBills> Rk = tWarehouseBillsMapper.selectAnPinList(tWarehouseBills);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -628,6 +628,16 @@ public class TWarehouseBills extends BaseEntity {
     private String annual;
     //开始结束月
     private List<Long> monthList;
+    //接单状态中文名
+    private String fTakeOrdersName;
+
+    public String getfTakeOrdersName() {
+        return fTakeOrdersName;
+    }
+
+    public void setfTakeOrdersName(String fTakeOrdersName) {
+        this.fTakeOrdersName = fTakeOrdersName;
+    }
 
     public Integer getfTakeOrders() {
         return fTakeOrders;

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

@@ -1610,6 +1610,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (warehouseBills.getfBsdate() == null){
             return AjaxResult.error("入库日期不能为空");
         }
+        int year = DateUtil.year(warehouseBills.getfBsdate());
+        int month = DateUtil.month(warehouseBills.getfBsdate());
+        List<TMonthEndingClosingExcel> tMonthEndingClosingExcel = tWarehousebillsfeesMapper.selectTMonthEndingClosingList(year, month+1, "T");
+        if (CollectionUtils.isNotEmpty(tMonthEndingClosingExcel)){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("当前入库日期"+year+"年"+(month+1)+"月"+"所在的年月已结账不能入账");
+        }
         JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfees);
         List<TWarehousebillsfees> warehousebillsfeesList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
         Integer i = null;
@@ -1653,7 +1660,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return judge;
             }
-            if (tWarehouseBills.getfBillstatus() != 2L && tWarehouseBills.getfBillstatus() != 3L) {
+            if (tWarehouseBills.getfBillstatus() != 2L && tWarehouseBills.getfBillstatus() != 3L
+                    && tWarehouseBills.getfBillstatus() != 6L) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("当前数据不允许保存");
             }
@@ -4034,11 +4042,19 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 查询 仓库主表信息、库存明细信息
         Integer i = null;
         TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
+        int year = DateUtil.year(tWarehousebills.getfBsdate());
+        int month = DateUtil.month(tWarehousebills.getfBsdate());
+        List<TMonthEndingClosingExcel> tMonthEndingClosingExcel = tWarehousebillsfeesMapper.selectTMonthEndingClosingList(year, month+1, "T");
+        if (CollectionUtils.isNotEmpty(tMonthEndingClosingExcel)){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("当前入库日期"+year+"年"+(month+1)+"月"+"所在的年月已结账不能撤销");
+        }
         // 修改主表信息
         tWarehousebills.setUpdateBy(loginUser.getUser().getUserName());
         tWarehousebills.setUpdateTime(new Date());
         tWarehousebills.setfBillstatus(2L); //撤销状态
         tWarehousebills.setfReviewDate(null);// 审核通过时间清空
+        tWarehousebills.setfTakeOrders(0);//接单状态改为未接单
         i =tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
         i =tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L, new Date());
         //撤销库存总账

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

@@ -694,7 +694,9 @@
                sr.user_name AS fpurchaseName,
                tw.f_create_log,
                tw.f_print_log,
-               tw.f_print
+               tw.f_print,
+               tw.f_take_orders,
+               tw.f_reason
         FROM t_warehousebills tw
                  LEFT JOIN t_project tp ON tw.f_goodsid = tp.f_id
                  LEFT JOIN t_corps tc ON tp.f_corpid = tc.f_id
@@ -2457,7 +2459,16 @@
         tw.f_print_log,
         tw.f_print,
         tw.f_take_orders,
-        tw.f_reason
+        tw.f_reason,
+        CASE
+
+        WHEN f_take_orders = '0' THEN
+        '待接单'
+        WHEN f_take_orders = '1' THEN
+        '已接单'
+        WHEN f_take_orders = '2' THEN
+        '拒绝'
+        END AS fTakeOrdersName
         FROM
         t_warehousebills tw
         LEFT JOIN t_project tp
@@ -2513,6 +2524,7 @@
             <if test="fBankcorpid != null  and fBankcorpid != ''">and tw.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and tw.f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null ">and tw.f_billstatus = #{fBillstatus}</if>
+            <if test="fBillstatus != null and fBillstatus == 7">and tw.f_billstatus != '6'</if>
             <if test="fItemsStatus != null ">and tw.f_items_status = #{fItemsStatus}</if>
             <if test="fBillingDeadline != null ">and tw.f_billing_deadline = #{fBillingDeadline}</if>
             <if test="fProductName != null  and fProductName != ''">and tw.f_product_name like concat('%',