Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InventoryCostInfoController.java

@@ -9,6 +9,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.IInventoryCostInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 库点费用信息 前端控制器
@@ -28,7 +30,7 @@ public class InventoryCostInfoController {
      * @return
      */
     @GetMapping("/selectInventoryCostInfo")
-    public Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo) {
+    public Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo) throws ParseException {
         return iInventoryCostInfoService.selectInventoryCostInfo(inventoryCostInfo);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InventoryCostInfo.java

@@ -10,10 +10,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -59,6 +61,8 @@ public class InventoryCostInfo extends BaseModel<InventoryCostInfo> {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date costDate;
     /**
      * 状态标识

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.InventoryCostInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 库点费用信息 服务类
@@ -20,7 +22,7 @@ public interface IInventoryCostInfoService extends IService<InventoryCostInfo> {
      * @param inventoryCostInfo
      * @return
      */
-    Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo);
+    Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo) throws ParseException;
 
     /**
      * 添加信息

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

@@ -134,8 +134,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 warehouseInOutInfo.setStatusFlag("3");
                 warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
                 warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
-                warehouseInOutInfo.setGoodsName(contractGoodsInfo.getGoodsName());
-                warehouseInOutInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
+                warehouseInOutInfo.setGoodsName(contractManagementInfo.getGoodsName());
+                warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
                 warehouseInOutInfo.setInOutType(NumberConstant.PURCHASE_WAREHOUSING);
                 warehouseInOutInfo.setBackOfficeId(contractManagementInfo.getCreateUserId());
                 warehouseInOutInfo.setBackOffice(AuthSecurityUtils.getStaffById(contractManagementInfo.getCreateUserId()).getStaffName());

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.winsea.svc.base.base.util.DateUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.InventoryCostInfo;
@@ -10,9 +11,15 @@ import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InventoryCostInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInventoryCostInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.commons.httpclient.util.DateUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
 /**
  * <p>
  * 库点费用信息 服务实现类
@@ -31,13 +38,18 @@ public class InventoryCostInfoServiceImpl extends ServiceImpl<InventoryCostInfoM
      * @return
      */
     @Override
-    public Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo) {
+    public Page<InventoryCostInfo> selectInventoryCostInfo(InventoryCostInfo inventoryCostInfo) throws ParseException {
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy");
+        Date start=simpleDateFormat.parse(inventoryCostInfo.getYear());
+        Date end=simpleDateFormat.parse(inventoryCostInfo.getYear()+1);
         Page<InventoryCostInfo> inventoryCostInfoPage = this.selectPage(inventoryCostInfo.getQueryPage(), new EntityWrapper<InventoryCostInfo>()
                 .eq("warehouse_id", inventoryCostInfo.getWarehouseId())
-                .eq("cost_date", inventoryCostInfo.getYear()));
+        .gt("cost_date",start)
+        .lt("cost_date",end));
         int count = this.selectCount( new EntityWrapper<InventoryCostInfo>()
                 .eq("warehouse_id", inventoryCostInfo.getWarehouseId())
-                .eq("cost_date", inventoryCostInfo.getYear()));
+                .gt("cost_date",start)
+                .lt("cost_date",end));
         inventoryCostInfoPage.setSize(count);
         return inventoryCostInfoPage;
     }
@@ -51,8 +63,10 @@ public class InventoryCostInfoServiceImpl extends ServiceImpl<InventoryCostInfoM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String addInventoryCostInfo(InventoryCostInfo inventoryCostInfo) {
+        Date now=new Date();
         //新增主键id
         inventoryCostInfo.setId(IdGenerator.generateUUID());
+        inventoryCostInfo.setCostDate(now);
         // 操作主表数据
         boolean one = this.insert(inventoryCostInfo);
         if (one) {

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

@@ -782,9 +782,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id",contractManagementInfo.getId()));
-                //查合同下的车牌号
+                //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo.getContractNo()));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -804,9 +804,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
-                //查移库任务编号下的车牌号
+                //查移库任务编号下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -876,9 +876,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id",contractManagementInfo.getId()));
-                //查合同下的车牌号
+                //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo.getContractNo()));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -898,9 +898,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (ContractManagementInfo contractManagementInfo1 : contractManagementInfoList1) {
                 ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id",contractManagementInfo1.getId()));
-                //查合同下的车牌号
+                //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo1.getContractNo()));
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
                 }
@@ -918,9 +918,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
-                //查移库任务编号下的车牌号
+                //查移库任务编号下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -66,7 +66,14 @@
         w.start_weight as startWeight,
         w.address_url as addressUrl,
         w.task_type as taskType,
-        w.bin_number as binNumber
+        w.bin_number as binNumber,
+        w.type,
+        w.deduction_weight as deductionWeight,
+        w.pure_weight as pureWeight,
+        w.deduction_amount as deductionAmount,
+        w.back_office as backOffice,
+        w.buckle_weight_ratio as buckleWeightRatio,
+        w.solid_grain_water as solidGrainWater
         FROM warehouse_in_out_info w
         left join warehouse_in_out_detail d on w.id=d.info_id
         left join warehouse_base_info wbi on wbi.warehouse_name = w.warehouse_name