1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -253,10 +253,10 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         {
             expenseInfo.setStatusFlag(StatusEnum.COST_PAYMENT.getFlag());
             expenseInfo.setStatus(StatusEnum.COST_PAYMENT.getName());
-//            //合同粮款没有未分配金额
-//            if(!"1".equals(expenseInfo.getCostType())&&!!"1".equals(expenseInfo.getExpensesPurpose())) {
-//                expenseInfo.setUnallocatedAmount(expenseInfo.getAmountMoney() - expenseInfo.getTotalDistribution());
-//            }
+            //库点费用未分配金额默认等于费用金额
+            if(!"1".equals(expenseInfo.getCostType())&&!!"1".equals(expenseInfo.getExpensesPurpose())) {
+                expenseInfo.setUnallocatedAmount(expenseInfo.getAmountMoney());
+            }
             this.insert(expenseInfo);
             //分配列表
             List<ExpenseAllocationInfo> expenseAllocationInfoList = expenseInfo.getExpenseAllocationInfoList();
@@ -602,13 +602,12 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                     .eq("move_task_no", contractNo);
         }
         if (warehouseName!=null){
-            warehousingOrderWrapper.eq("warehouse_name", warehouseName);
+            warehousingOrderWrapper.andNew().eq("warehouse_name", warehouseName);
         }
         if (receiptDocDate!=null){
-            warehousingOrderWrapper.like("issuing_time", receiptDocDate);
+            warehousingOrderWrapper.andNew().like("issuing_time", receiptDocDate);
         }
-        warehousingOrderWrapper.ne("in_type","退库");
-        warehousingOrderWrapper.orderBy("update_date");
+        warehousingOrderWrapper.ne("in_type","退库").orderBy("update_date");;
         List<WarehousingOrder> warehousingOrderList = warehousingOrderService.selectList(warehousingOrderWrapper);
         return warehousingOrderList;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -10,6 +10,7 @@ import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.base.service.ICommonStaffRoleService;
 import com.winsea.svc.base.base.service.ICommonStaffService;
+import com.winsea.svc.base.base.util.DateUtils;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
@@ -33,6 +34,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.Const;
 import com.yh.saas.toolkit.workflow.service.IWorkflowService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.httpclient.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -624,6 +626,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Override
     public List<InOutWarehouseTask> selectInOutWarehouseNo(InOutWarehouseTask inOutWarehouseTask) {
         List<InOutWarehouseTask> inOutWarehouseTaskList=new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH, -3);
         //出库执行中的编号
         if ("1".equals(inOutWarehouseTask.getFlag())) {
             List<InOutWarehouseTask> inOutWarehouseTaskList1 = this.selectList(new EntityWrapper<InOutWarehouseTask>()
@@ -634,6 +638,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     .ne("in_out_type","收购入库")
                     .ne("in_out_type","退库")
                     .ne("in_out_type","移库入库")
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             inOutWarehouseTaskList=inOutWarehouseTaskList1;
         }
@@ -644,6 +649,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     .eq("task_status_key", "5")
                     .eq("warehouse_name", inOutWarehouseTask.getWarehouseName())
                     .eq("in_out_type","收购入库")
+                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             inOutWarehouseTaskList=inOutWarehouseTaskList1;
         }
@@ -656,6 +662,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     .ne("in_out_type","销售出库")
                     .ne("in_out_type","收购入库")
                     .ne("in_out_type","移库出库")
+                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             inOutWarehouseTaskList=inOutWarehouseTaskList1;
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -834,9 +834,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (compId == null || compId.isEmpty()) {
             compId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
         }
-
         Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.MONTH, -2);
+        calendar.add(Calendar.MONTH, -3);
         List<ContractManagementInfo> temp = new ArrayList();
         List<ContractManagementInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_CONTRACTINFO+compId+flag,ContractManagementInfo.class);
         if(listRedis != null && listRedis.size() > 0 ){