1.可视化损益单接口对接

2.质检信息接口对接
3.粮情检测接口对接
4.仓房信息接口对接
5.出入库信息接口对接
6.货拉卡接口对接
7.地图数据展示接口对接
8.附件信息数据不对bug修改

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxPageReqVO.java

@@ -25,4 +25,10 @@ public class CrkxxPageReqVO extends PageParam {
     @Schema(description = "仓房id(DELIVERY_CAXX.ID)", example = "873")
     private Long cfId;
 
+    @Schema(description = "出入库类型", example = "0")
+    private Integer crklx;
+
+    @Schema(description = "业务日期")
+    private String ywrq;
+
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/KshzsController.java

@@ -4,6 +4,8 @@ import com.unis.framework.common.pojo.CommonResult;
 import com.unis.framework.common.pojo.PageResult;
 import com.unis.module.coding.controller.admin.kshzs.vo.kqxxVo;
 import com.unis.module.coding.controller.admin.kshzs.vo.*;
+import com.unis.module.coding.dal.dataobject.hwk.HwkDO;
+import com.unis.module.coding.service.hwk.HwkService;
 import com.unis.module.coding.service.kshzs.KshzsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,6 +35,9 @@ public class KshzsController {
     @Resource
     private KshzsService kshzsService;
 
+    @Resource
+    private HwkService hwkService;
+
     @PostMapping("/selectKqmcList")
     @Operation(summary = "库区名称搜索")
     public CommonResult<List<kqxxVo>> selectKqmcList(@Valid @RequestBody paramVo paramVo) {
@@ -103,10 +108,21 @@ public class KshzsController {
         if (dataObj.getList() != null || dataObj.getList().size() > 0) {
             for (crkVo crkVo : dataObj.getList()){
                if(crkVo.getCrklx() == 0){
-                   crkVo.setYwrq(crkVo.getCmsj().toString().substring(0,10));
+                   if (crkVo.getCmsj() != null) {
+                       crkVo.setYwrq(crkVo.getCmsj().toString().substring(0,10));
+                   }
                }else{
-                   crkVo.setYwrq(crkVo.getRmsj().toString().substring(0,10));
+                   if (crkVo.getRmsj() != null) {
+                       crkVo.setYwrq(crkVo.getRmsj().toString().substring(0,10));
+                   }
                }
+
+                if (crkVo.getHwkId() != null) {
+                    HwkDO hwkDO = hwkService.getHwk(crkVo.getHwkId());
+                    if (hwkDO != null && hwkDO.getHwmc() != null) {
+                        crkVo.setCfhw(hwkDO.getHwmc());
+                    }
+                }
             }
         }
         return CommonResult.success(dataObj);

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/crkVo.java

@@ -33,6 +33,9 @@ public class crkVo {
     @Schema(description = "车船号")
     private String cch;
 
+    @Schema(description = "货位卡id")
+    private Long hwkId;
+
     @Schema(description = "仓房货位")
     private String cfhw;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/hwkVo.java

@@ -35,6 +35,9 @@ public class hwkVo {
     @Schema(description = "粮食场地")
     private String lscd;
 
+    @Schema(description = "粮食场地名称")
+    private String lscdmc;
+
     @Schema(description = "实际数量")
     private BigDecimal sjsl;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/pageParamVo.java

@@ -23,5 +23,5 @@ public class pageParamVo extends PageParam {
     private String ywrq;
 
     @Schema(description = "类型")
-    private String lx;
+    private Integer crklx;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/crkxx/CrkxxMapper.java

@@ -18,11 +18,22 @@ import com.unis.module.coding.controller.admin.crkxx.vo.*;
 public interface CrkxxMapper extends BaseMapperX<CrkxxDO> {
 
     default PageResult<CrkxxDO> selectPage(CrkxxPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<CrkxxDO>()
+        LambdaQueryWrapperX<CrkxxDO> qw = new LambdaQueryWrapperX<CrkxxDO>()
                 .eqIfPresent(CrkxxDO::getLspzmc, reqVO.getLspzmc())
                 .eqIfPresent(CrkxxDO::getLsdjbm, reqVO.getLsdjbm())
                 .eqIfPresent(CrkxxDO::getCfId, reqVO.getCfId())
-                .orderByDesc(CrkxxDO::getId));
+                .eqIfPresent(CrkxxDO::getCrklx, reqVO.getCrklx())
+                .orderByDesc(CrkxxDO::getId);
+        if (reqVO.getYwrq() != null && !reqVO.getYwrq().isEmpty()) {
+            String begin = reqVO.getYwrq().substring(0,10) + " 00:00:00";
+            String end = reqVO.getYwrq().substring(0,10) + " 23:59:59";
+            if (reqVO.getCrklx() == 0) {
+                qw.betweenIfPresent(CrkxxDO ::getCmsj, begin, end);
+            }else{
+                qw.betweenIfPresent(CrkxxDO ::getRmsj, begin, end);
+            }
+        }
+        return selectPage(reqVO, qw);
     }
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kshzs/KshzsServiceImpl.java

@@ -9,9 +9,11 @@ import com.unis.module.coding.controller.admin.kshzs.vo.*;
 import com.unis.module.coding.controller.admin.syxx.vo.SyxxPageReqVO;
 import com.unis.module.coding.controller.admin.zjxx.vo.ZjxxPageReqVO;
 import com.unis.module.coding.dal.dataobject.crkxx.CrkxxDO;
+import com.unis.module.coding.dal.dataobject.hwk.HwkDO;
 import com.unis.module.coding.dal.dataobject.syxx.SyxxDO;
 import com.unis.module.coding.dal.dataobject.zjxx.ZjxxDO;
 import com.unis.module.coding.dal.mysql.crkxx.CrkxxMapper;
+import com.unis.module.coding.dal.mysql.hwk.HwkMapper;
 import com.unis.module.coding.dal.mysql.kshzs.KshzsMapper;
 import com.unis.module.coding.dal.mysql.syxx.SyxxMapper;
 import com.unis.module.coding.dal.mysql.zjxx.ZjxxMapper;
@@ -53,6 +55,9 @@ public class KshzsServiceImpl implements KshzsService{
     @Resource
     private DictDataMapper dictDataMapper;
 
+    @Resource
+    private HwkMapper hwkMapper;
+
     @Override
     public Map<String, Object> selectMapList(paramVo paramVo) {
         Map<String, Object> mobjMap = new HashMap<>();
@@ -185,7 +190,11 @@ public class KshzsServiceImpl implements KshzsService{
 
     @Override
     public hwkVo selectHwkInfo(paramVo paramVo) {
-        return kshzsMapper.selectHwkInfo(paramVo);
+        hwkVo hwkVo = kshzsMapper.selectHwkInfo(paramVo);
+        if (hwkVo!= null && hwkVo.getLscd() != null) {
+
+        }
+        return hwkVo;
     }
 
     @Override
@@ -196,6 +205,8 @@ public class KshzsServiceImpl implements KshzsService{
         reqVO.setPageNo(paramVo.getPageNo());
         reqVO.setPageSize(paramVo.getPageSize());
         reqVO.setCfId(Long.valueOf(paramVo.getCfid()));
+        reqVO.setCrklx(paramVo.getCrklx());
+        reqVO.setYwrq(paramVo.getYwrq());
         PageResult<CrkxxDO> crkxxDOPageResult = crkxxMapper.selectPage(reqVO);
         for (CrkxxDO crkxxDO : crkxxDOPageResult.getList()) {
             if (crkxxDO.getLsdjbm() != null){

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -87,7 +87,7 @@
             ck.LXDH lxdh,
             ifnull(t1.HYRY_NAME, '-') hyry_name,
             t1.hy_state,
-            dk.file_ids
+            dk.PZXX file_ids
         from DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -130,7 +130,7 @@
 
     <select id="selectCfInfo" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.cfxxVo">
         SELECT
-             camc cfmc,cfbm cabh,cflx,jfsyrq,sjsynx,sjcr,cazt cfzt,khmc dwmc,khlxdh lxdh,khbh tyshxydm from DELIVERY_CAXX
+             camc cfmc,cfbm cabh,cflx,jfsyrq,sjsynx,sjcr,cazt cfzt,khmc dwmc,khlxdh lxdh,khbh tyshxydm
         FROM DELIVERY_CAXX
         <where>
             <if test="cfid != null and cfid != ''">
@@ -149,8 +149,9 @@
                 WHEN lsdjbm = '05' THEN '五等'
                 ELSE '等外'
                 END AS lsdjmc
-                ,shnd,cdbm lscd,sjsl,jjsl,rksj,bgfs from DELIVERY_HWK
-            left join DELIVERY_CAXX ca on cf_id = ca.id
+                ,shnd,cdbm lscd, al.AREA_NAME lscdmc,sjsl,jjsl,rksj,bgfs from DELIVERY_HWK dh
+            left join DELIVERY_CAXX ca on dh.cf_id = ca.id
+            left join system_area_level al on dh.cdbm = al.AREA_CODE
         <where>
             <if test="cfid != null and cfid != ''">
                 and cf_id = #{cfid}