diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index f6a1a31b91..c0a9399e93 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/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("本金转累欠"); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java index d2f27e20c9..d52d2b5f36 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java +++ b/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 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(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java index bfd264f0b2..797d461418 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java +++ b/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 map); LoanTransferPaymentRecordVo paymentDetails(String sid); + + List selFinJrList(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml index 13eb06df12..7fbee91db8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml +++ b/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} + UPDATE loan_transfer_payment_apply SET nodeState=#{nodeState} @@ -91,4 +102,4 @@ WHERE sid = #{sid} - \ No newline at end of file + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index aabc52c568..fce994cefd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/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 0) { + List jrList = baseMapper.selFinJrList(planDetails.getSid()); + if (null != jrList) { + if (jrList.size() > 0) { voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER2.getCode()); } else { voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER1.getCode()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java index 3c14cc30be..3a4b6ab593 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java @@ -73,4 +73,12 @@ public class WmsWarehouseAreaRest { List vo = wmsWarehouseAreaService.selectAll(ckSid); return rb.success().setData(vo); } + + @ApiOperation("根据区域sid查询所有库区") + @GetMapping("/selectAreaAll") + public ResultBean> selectAreaAll(@RequestParam("qySid") String qySid){ + ResultBean rb = ResultBean.fireFail(); + List vo = wmsWarehouseAreaService.selectAreaAll(qySid); + return rb.success().setData(vo); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseZoneRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseZoneRest.java new file mode 100644 index 0000000000..0ac20c034e --- /dev/null +++ b/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> listPage(@RequestBody PagerQuery pq) { + return wmsWarehouseZoneService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseZoneService.getAllType(query); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseZoneDto dto) { + return wmsWarehouseZoneService.saveZone(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean 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> selectAll(@RequestParam("ckSid") String ckSid){ + ResultBean rb = ResultBean.fireFail(); + List vo = wmsWarehouseZoneService.selectAll(ckSid); + return rb.success().setData(vo); + } +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java index c6a9e38589..3867bb301e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java +++ b/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 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java index cf8b1c4315..c648e1d2d4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java +++ b/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;//货区类型 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java index df6530605d..ba6e8e84c8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java @@ -29,4 +29,7 @@ public interface WmsWarehouseAreaMapper extends BaseMapper { List 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 selectAreaAll(String qySid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml index 746b56e503..4b41d6bc9e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml @@ -6,9 +6,10 @@ 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 ${ew.sqlSegment} @@ -17,10 +18,11 @@ + 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 + + ${ew.sqlSegment} + + + + + + + + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java new file mode 100644 index 0000000000..ac9737ffd7 --- /dev/null +++ b/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; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java new file mode 100644 index 0000000000..4b930a0500 --- /dev/null +++ b/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 { + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private WmsWarehouseInfoService warehouseInfoService; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseZoneQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean 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 p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo 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 page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean> getAllType(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List 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 list = baseMapper.listAll(useOrgSid); + return rb.success().setData(list); + } + + public ResultBean 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 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 selectAll(String ckSid) { + return baseMapper.selectAll(ckSid); + } +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java new file mode 100644 index 0000000000..85432826f7 --- /dev/null +++ b/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;//仓库名称 +}