仓库区域管理

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.biz.kingdee;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
@@ -416,6 +417,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
                 if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    if (null != voucherDetail.getDataTime()) {
+                        newVoucher.setBussDate(DateUtil.formatDate(voucherDetail.getDataTime()));
+                    }
                     Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
                     Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                     dto1.setSummary("本金转累欠");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java

@@ -73,6 +73,11 @@ public class ScheduledRepaymentPlanDetailsService {
      */
     @Scheduled(cron = "0 0 23 1 * ?")
     public void pushLateVoucher() {
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();//new一个Calendar类,把Date放进去
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, -1);
+        Date time = calendar.getTime();
         List<String> useOrgSidList = loanRepaymentPlanDetailsService.selUseOrgSidListForLateVoucher();
         useOrgSidList.removeAll(Collections.singleton(null));
         if (!useOrgSidList.isEmpty()) {
@@ -86,6 +91,7 @@ public class ScheduledRepaymentPlanDetailsService {
                         if (null != planDetails) {
                             planSids.add(planDetails.getPlanSid());
                             GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
+                            voucherDetail.setDataTime(time);
                             if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
                                 String useOrgSid = planDetails.getUseOrgSid();
                                 SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply;
@@ -12,6 +13,7 @@ import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPayment
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -28,4 +30,6 @@ public interface LoanTransferPaymentApplyMapper extends BaseMapper<LoanTransferP
     int updateFlowFiled(Map<String, Object> map);
 
     LoanTransferPaymentRecordVo paymentDetails(String sid);
+
+    List<FinUncollectedReceivablesDetailedJR> selFinJrList(@Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml

@@ -76,6 +76,17 @@
                  LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
         where r.sid = #{sid}
     </select>
+    <select id="selFinJrList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        SELECT
+            *
+        FROM
+            anrui_fin.fin_uncollected_receivables_detailed_jr
+        WHERE
+            busSid = #{sid}
+          AND payCostTitleValue = '资方退还垫款'
+          AND reveivableMoney > 0
+    </select>
     <update id="updateFlowFiled">
         UPDATE loan_transfer_payment_apply
         SET nodeState=#{nodeState}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -24,6 +24,7 @@ import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@@ -866,8 +867,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planDetailSid);
                     if (null != planDetails) {
                         PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
-                        if (null != planDetails.getPaymentMoney()) {
+                        List<FinUncollectedReceivablesDetailedJR> jrList = baseMapper.selFinJrList(planDetails.getSid());
-                            if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) > 0) {
+                        if (null != jrList) {
+                            if (jrList.size() > 0) {
                                 voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER2.getCode());
                             } else {
                                 voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER1.getCode());

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java

@@ -73,4 +73,12 @@ public class WmsWarehouseAreaRest {
         List<WmsWarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAll(ckSid);
         return rb.success().setData(vo);
     }
+
+    @ApiOperation("根据区域sid查询所有库区")
+    @GetMapping("/selectAreaAll")
+    public ResultBean<List<WmsWarehouseAreaAllVo>> selectAreaAll(@RequestParam("qySid") String qySid){
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsWarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAreaAll(qySid);
+        return rb.success().setData(vo);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseZoneRest.java

@@ -0,0 +1,78 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.*;
+import com.yxt.wms.biz.base.wmswarehousezone.*;
+import com.yxt.wms.utils.OrgPathQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:53
+ */
+@Api(tags = "区域信息")
+@RestController
+@RequestMapping("/apiadmin/base/wmswarehousezone")
+public class WmsWarehouseZoneRest {
+
+    @Autowired
+    private WmsWarehouseZoneService wmsWarehouseZoneService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WmsWarehouseZoneVo>> listPage(@RequestBody PagerQuery<WmsWarehouseZoneQuery> pq) {
+        return wmsWarehouseZoneService.listPage(pq);
+    }
+    @ApiOperation("查询所有的库区")
+    @PostMapping("/listAll")
+    public ResultBean<List<WmsWarehouseZone>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseZoneService.getAllType(query);
+    }
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseZoneDto dto) {
+        return wmsWarehouseZoneService.saveZone(dto);
+    }
+
+    @ApiOperation("初始化")
+    @GetMapping("/initialization/{sid}")
+    public ResultBean<WmsWarehouseZoneInitVo> initialization(@PathVariable("sid") String sid) {
+        return wmsWarehouseZoneService.initialization(sid);
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable("sid") String sid) {
+        return wmsWarehouseZoneService.delete(sid);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        wmsWarehouseZoneService.delAll(sids);
+        return rb.success();
+    }
+
+    @ApiOperation("更改可用状态")
+    @GetMapping("/updateIsEnable/{sid}/{isEnable}")
+    public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
+        return wmsWarehouseZoneService.updateIsEnable(sid,isEnable);
+    }
+
+    @ApiOperation("根据仓库sid查询所有库位")
+    @GetMapping("/selectAll")
+    public ResultBean<List<WmsWarehouseZoneAllVo>> selectAll(@RequestParam("ckSid") String ckSid){
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsWarehouseZoneAllVo> vo = wmsWarehouseZoneService.selectAll(ckSid);
+        return rb.success().setData(vo);
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java

@@ -14,16 +14,11 @@ import java.util.UUID;
  */
 @Data
 public class WmsWarehouseArea extends BaseEntity {
-//    private String id;
-//    private String sid= UUID.randomUUID().toString();
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private Date createTime;
-//    private String remarks;
-//    private String isEnable;
     private String areaName;//库位名称
     private String areaCode;//库位编码
     private String warehouseSid;//仓库sid
     private BigDecimal volume;//库位容量
     private String unit;//计量单位
     private String areaTypeSid;//货区类型
+    private String zoneSid;//区域sid
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java

@@ -21,6 +21,7 @@ public class WmsWarehouseAreaDto implements Dto {
     private String areaName;//库位名称
     private String areaCode;//库位编码
     private String warehouseSid;//仓库sid
+    private String zoneSid;//仓库sid
     private String volume;//库位容量
     private String unit;//计量单位
     private String areaTypeSid;//货区类型

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@@ -29,4 +29,7 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
     List<WmsWarehouseArea> listAll(@Param("useOrgSid") String useOrgSid);
 
     int selectNum(@Param("warehouseCode") String warehouseCode);
+
+    @Select("select * from wms_warehouse_area where zoneSid = #{qySid} and isDelete = 0 and isEnable = 1")
+    List<WmsWarehouseAreaAllVo> selectAreaAll(String qySid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@@ -6,9 +6,10 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
         select
-        a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
+        a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName,z.zoneName
         from wms_warehouse_area a
         left join wms_warehouse_info b on b.sid=a.warehouseSid
+        left join wms_warehouse_zone z on z.sid=a.zoneSid
         left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
         LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
         <where>
@@ -19,11 +20,12 @@
         select a.*,
                a.createBySid           as userSid,
                b.warehouseName         as warehouseName,
-               c.warehouseAreaTypeName as areaTypeName
+               c.warehouseAreaTypeName as areaTypeName,
+               z.zoneName as zoneName
         from wms_warehouse_area a
                  left join wms_warehouse_info b on b.sid = a.warehouseSid
                  left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
-
+                 left join wms_warehouse_zone z on z.sid = a.zoneSid
         where a.sid = #{sid}
     </select>
     <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@@ -191,4 +191,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
     public List<WmsWarehouseAreaAllVo> selectAll(String ckSid) {
         return baseMapper.selectAll(ckSid);
     }
+
+    public List<WmsWarehouseAreaAllVo> selectAreaAll(String qySid) {
+        return baseMapper.selectAreaAll(qySid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java

@@ -30,6 +30,10 @@ public class WmsWarehouseAreaVo implements Vo {
     private String unit;//计量单位
     private String areaTypeSid;//货区类型
     private String warehouseName;//仓库名称
+    private String zoneSid;//区域sid
+    private String zoneName;//区域名称
     private String areaTypeName;//货区类型名称
     private String userSid;
+
+
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java

@@ -27,4 +27,5 @@ public class WmsWarehouseRack extends BaseEntity {
     private String rackFullCode;//库位全码（仓库编码-库区编码-库位编码）
     @ApiModelProperty("打印次数")
     private Integer printCount;
+    private String zoneSid;//区域sid
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java

@@ -23,4 +23,6 @@ public class WmsWarehouseRackDto implements Dto {
     private String warehouseSid;//仓库sid
     private String locationSid;//库位sid
     private String userSid;
+    private String zoneSid;//区域sid
+    private String zoneName;//区域名称
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml

@@ -6,10 +6,11 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
         select
-        a.*,b.areaName as locationName ,c.warehouseName as warehouseName
+        a.*,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName
         from wms_warehouse_rack a
         left join wms_warehouse_area b on b.sid =a.locationSid
         left join wms_warehouse_info c on c.sid = a.warehouseSid
+        left join wms_warehouse_zone z on z.sid = a.zoneSid
         LEFT JOIN anrui_portal.sys_organization as s ON c.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
@@ -17,10 +18,11 @@
     </select>
     <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
         select
-            a.*,a.createBySid as userSid,b.areaName as locationName ,c.warehouseName as warehouseName
+            a.*,a.createBySid as userSid,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName as zoneName
         from wms_warehouse_rack a
                  left join wms_warehouse_area b on b.sid =a.locationSid
                  left join wms_warehouse_info c on c.sid = a.warehouseSid
+                 left join wms_warehouse_zone z on z.sid = a.zoneSid
         where a.sid =#{sid}
     </select>
     <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack">

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java

@@ -30,4 +30,6 @@ public class WmsWarehouseRackVo implements Vo {
     private String warehouseName;//仓库名称
     private String locationName;//库位名称
     private String userSid;
+    private String zoneSid;//区域sid
+    private String zoneName;//区域名称
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZone.java

@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:38
+ */
+@Data
+public class WmsWarehouseZone extends BaseEntity {
+    private String zoneName;//库位名称
+    private String zoneCode;//库位编码
+    private String warehouseSid;//仓库sid
+    private BigDecimal volume;//库位容量
+    private String unit;//计量单位
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneAllVo.java

@@ -0,0 +1,21 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:58
+ */
+@Data
+public class WmsWarehouseZoneAllVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("区域名称")
+    private String zoneName;
+    @ApiModelProperty("区域编码")
+    private String zoneCode;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneDto.java

@@ -0,0 +1,27 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:37
+ */
+@Data
+public class WmsWarehouseZoneDto implements Dto {
+
+    private String sid;
+    private String remarks;
+    private String zoneName;//区域名称
+    private String zoneCode;//区域编码
+    private String warehouseSid;//仓库sid
+    private String warehouseName;//仓库
+    private String volume;//区域面积
+    private String unit;//计量单位
+    private String userSid; //用户sid
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:39
+ */
+@Data
+public class WmsWarehouseZoneInitVo {
+
+    private String sid;
+    private String remarks;
+    private String zoneName;//区域名称
+    private String zoneCode;//区域编码
+    private String warehouseSid;//仓库sid
+    private String warehouseName;//仓库
+    private String volume;//区域面积
+    private String unit;//计量单位
+    private String userSid; //用户sid
+
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.java

@@ -0,0 +1,38 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseZoneMapper extends BaseMapper<WmsWarehouseZone> {
+
+    IPage<WmsWarehouseZoneVo> listPage(IPage<WmsWarehouseZone> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseZone> qw);
+
+    List<WmsWarehouseZone> listAll(@Param("useOrgSid") String useOrgSid);
+
+    WmsWarehouseZone checkForInsert(@Param("zoneCode") String zoneCode,@Param("warehouseSid") String warehouseSid);
+
+    int selectNum(@Param("warehouseCode") String warehouseCode);
+
+    WmsWarehouseZone checkForUpdate(@Param("zoneCode") String zoneCode, @Param("warehouseSid")String warehouseSid,@Param("sid") String sid);
+
+    WmsWarehouseZoneInitVo initialization(String sid);
+
+    int updateBySidIsDelete(List<String> list);
+
+    List<WmsWarehouseZoneAllVo> selectAll(String ckSid);
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneMapper">
+    <update id="updateBySidIsDelete">
+        UPDATE wms_warehouse_zone
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneVo">
+        select
+        a.*,b.warehouseName as warehouseName
+        from wms_warehouse_zone a
+        left join wms_warehouse_info b on b.sid=a.warehouseSid
+        LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone">
+        select a.*
+        from wms_warehouse_zone a
+                 left join wms_warehouse_info b on b.sid = a.warehouseSid
+        where b.useOrgSid = #{useOrgSid}
+          and a.isDelete = 0
+    </select>
+    <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone">
+        select *
+        from wms_warehouse_zone
+        where zoneCode = #{zoneCode}
+          and warehouseSid = #{warehouseSid}
+          and isDelete = 0
+    </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(zoneCode), #{warehouseCode}, '') AS SIGNED), 0) as code
+        from wms_warehouse_zone
+        where zoneCode LIKE concat(#{warehouseCode}, '%')
+    </select>
+    <select id="checkForUpdate" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone">
+        select *
+        from wms_warehouse_zone
+        where zoneCode = #{zoneCode}
+          and warehouseSid = #{warehouseSid}
+          and sid !=#{sid}
+          and isDelete=0
+    </select>
+    <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneInitVo">
+        select a.*,
+               a.createBySid           as userSid,
+               b.warehouseName         as warehouseName
+        from wms_warehouse_zone a
+                 left join wms_warehouse_info b on b.sid = a.warehouseSid
+        where a.sid = #{sid}
+    </select>
+    <select id="selectAll" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneAllVo">
+        select * from wms_warehouse_zone where warehouseSid = #{ckSid} and isDelete = 0 and isEnable = 1
+    </select>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:24
+ */
+@Data
+public class WmsWarehouseZoneQuery implements Query {
+
+    private String name;//名字
+    private String code;//编码
+    private String warehouseSid;//仓库
+
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java

@@ -0,0 +1,195 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.*;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
+import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
+import com.yxt.wms.utils.Rule;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:19
+ */
+@Service
+public class WmsWarehouseZoneService extends MybatisBaseService<WmsWarehouseZoneMapper, WmsWarehouseZone> {
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private WmsWarehouseInfoService warehouseInfoService;
+
+    public ResultBean<PagerVo<WmsWarehouseZoneVo>> listPage(PagerQuery<WmsWarehouseZoneQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsWarehouseZoneQuery query = pq.getParams();
+        QueryWrapper<WmsWarehouseZone> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                PagerVo<WmsWarehouseZoneVo> p = new PagerVo<>();
+                return rb.success().setData(p);
+            }
+        } else {
+            PagerVo<WmsWarehouseZoneVo> p = new PagerVo<>();
+            return rb.success().setData(p);
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("a.zoneName", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getCode())) {
+            qw.like("a.zoneCode", query.getCode());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+            qw.eq("b.sid", query.getWarehouseSid());
+        }
+        qw.ne("a.isDelete", "1");
+        IPage<WmsWarehouseZone> page = PagerUtil.queryToPage(pq);
+        IPage<WmsWarehouseZoneVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WmsWarehouseZoneVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+    public ResultBean<List<WmsWarehouseZone>> getAllType(OrgPathQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseZone> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
+    }
+
+    public ResultBean<String> saveZone(WmsWarehouseZoneDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            String sid = dto.getSid();
+            WmsWarehouseZone wmsWarehouseZone = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, wmsWarehouseZone, "id", "sid");
+            if (StringUtils.isNotBlank(dto.getZoneCode()) && !dto.getZoneCode().equals("由系统自动生成")) {
+                WmsWarehouseZone zone = baseMapper.checkForUpdate(dto.getZoneCode(), dto.getWarehouseSid(), sid);
+                if (null != zone) {
+                    return rb.setMsg("同一个仓库下的区域编码不能重复。");
+                }
+            } else {
+                WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(dto.getWarehouseSid());
+                if (null != warehouseInfo) {
+                    String warehouseCode = warehouseInfo.getWarehouseCode();
+                    int i = baseMapper.selectNum(warehouseCode);
+                    String code = Rule.getBillNo3(warehouseCode, i);
+                    wmsWarehouseZone.setZoneCode(code);
+                }
+            }
+            wmsWarehouseZone.setModifyTime(new Date());
+            baseMapper.updateById(wmsWarehouseZone);
+        } else {
+            WmsWarehouseZone entity = new WmsWarehouseZone();
+            entity.setCreateBySid(dto.getUserSid());
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            if (StringUtils.isNotBlank(dto.getZoneCode()) && !dto.getZoneCode().equals("由系统自动生成")) {
+                WmsWarehouseZone zone = baseMapper.checkForInsert(dto.getZoneCode(), dto.getWarehouseSid());
+                if (null != zone) {
+                    return rb.setMsg("同一个仓库下的区域编码不能重复。");
+                }
+            } else {
+                WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(dto.getWarehouseSid());
+                if (null != warehouseInfo) {
+                    String warehouseCode = warehouseInfo.getWarehouseCode();
+                    int i = baseMapper.selectNum(warehouseCode);
+                    String code = Rule.getBillNo3(warehouseCode, i);
+                    entity.setZoneCode(code);
+                }
+            }
+            baseMapper.insert(entity);
+        }
+        return rb.success();
+    }
+
+    public ResultBean<WmsWarehouseZoneInitVo> initialization(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsWarehouseZoneInitVo vo = baseMapper.initialization(sid);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean delete(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsWarehouseZone wmsWarehouseZone = fetchBySid(sid);
+        if (null != wmsWarehouseZone) {
+            baseMapper.deleteById(wmsWarehouseZone.getId());
+        }
+        return rb.success();
+    }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
+    public ResultBean updateIsEnable(String sid, String isEnable) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsWarehouseZone wmsWarehouseZone = fetchBySid(sid);
+        if (null != wmsWarehouseZone) {
+            wmsWarehouseZone.setIsEnable(Integer.parseInt(isEnable));
+            baseMapper.updateById(wmsWarehouseZone);
+        }
+        return rb.success().setMsg("成功");
+    }
+
+    public List<WmsWarehouseZoneAllVo> selectAll(String ckSid) {
+        return baseMapper.selectAll(ckSid);
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java

@@ -0,0 +1,26 @@
+package com.yxt.wms.biz.base.wmswarehousezone;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/14 14:24
+ */
+@Data
+public class WmsWarehouseZoneVo implements Vo {
+
+    private String sid;
+    private String remarks;
+    private String isEnable;
+    private String isDelete;
+    private String zoneName;//区域名称
+    private String zoneCode;//区域编码
+    private String volume;//区域面积
+    private String unit;//计量单位
+    private String warehouseName;//仓库名称
+}