修改库区编码生成规则

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

@@ -13,6 +13,8 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo;
+import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone;
+import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
@@ -41,6 +43,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private WmsWarehouseInfoService warehouseInfoService;
+    @Autowired
+    private WmsWarehouseZoneService wmsWarehouseZoneService;
 
     public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -140,17 +144,18 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
 //                return rb.setMsg("同一个仓库下的库区编码不能重复。");
 //            }
             String warehouseSid = dto.getWarehouseSid();
+            String zoneSid = dto.getZoneSid();
             WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea();
             sid = wmsWarehouseArea.getSid();
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setCreateTime(new DateTime());
             wmsWarehouseArea.setCreateBySid(dto.getUserSid());
             wmsWarehouseArea.setIsEnable(1);
-            WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(warehouseSid);
-            if (null != warehouseInfo) {
-                String warehouseCode = warehouseInfo.getWarehouseCode();
-                int i = baseMapper.selectNum(warehouseCode);
-                String code = Rule.getBillNo3(warehouseCode, i);
+            WmsWarehouseZone wmsWarehouseZone = wmsWarehouseZoneService.fetchBySid(zoneSid);
+            if (null != wmsWarehouseZone) {
+                String zoneCode = wmsWarehouseZone.getZoneCode();
+                int i = baseMapper.selectNum(zoneCode);
+                String code = Rule.getBillNo3(zoneCode, i);
                 wmsWarehouseArea.setAreaCode(code);
             }
             baseMapper.insert(wmsWarehouseArea);