9/26 增加工位类型

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -16,6 +16,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.auth.WarehouseUserEntity;
 import com.glxp.api.entity.basic.BasicCollectPointEntity;
@@ -78,6 +79,8 @@ public class SysWorkplaceController extends BaseController {
 
     @Resource
     private SysWorkplaceDocumentService sysWorkplaceDocumentService;
+    @Resource
+    DeptService deptService;
 
 
     @PostMapping("/udiwms/sysWorkplace/page")
@@ -88,6 +91,10 @@ public class SysWorkplaceController extends BaseController {
 //                .or()
 //                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey())
 //        );
+        DeptEntity deptEntity = deptService.selectByCode(request.getDeptCode());
+        if (deptEntity.getPid() == 0){
+            request.setDeptCode(null);
+        }
         List<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
         PageInfo<SysWorkplaceResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<SysWorkplaceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -258,8 +265,7 @@ public class SysWorkplaceController extends BaseController {
     @Resource
     private WarehouseUserService warehouseUserService;
 
-    @Resource
+
-    DeptService deptService;
 
     @Resource
     private AuthAdminService authAdminService;

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -102,6 +102,9 @@ public class IoOrderController extends BaseController {
     @Resource
     UdiProductDao udiProductDao;
 
+    @Resource
+    IoSplitFifoCodeService fifoCodeService;
+
     /**
      * 查询单据列表
      *
@@ -393,6 +396,26 @@ public class IoOrderController extends BaseController {
         if (baseResponse != null)
             return baseResponse;
 
+
+        //上货校验追溯码是否重复
+        if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
+            for (IoCodeTempEntity codeTempEntity :codeTempEntities){
+                IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(codeTempEntity.getCode(), null);
+                if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
+                    return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() +"已存在！");
+                }
+            }
+        }
+        //退货校验追溯码是否重复
+        if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
+            for (IoCodeTempEntity codeTempEntity :codeTempEntities){
+                IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(codeTempEntity.getCode(), null);
+                if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
+                    return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() +"已存在！");
+                }
+            }
+        }
+
         String priceFifo = systemParamConfigService.selectValueByParamKey("price_fifo");
         if (IntUtil.value(priceFifo) > 0 && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
             List<IoCodeTempEntity> resultList = new ArrayList<>();

src/main/java/com/glxp/api/entity/auth/SysWorkplace.java

@@ -100,6 +100,12 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "workplaceType")
     private Integer workplaceType;
 
+    /**
+     * 工位类型 1:采集工位; 2: 上货工位
+     */
+    @TableField(value = "workplaceClass")
+    private Integer workPlaceClass;
+
 
     @TableField(exist = false)
     private String invName;

src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java

@@ -137,6 +137,12 @@ public class SysWorkplaceResponse {
     @TableField(value = "workplaceType")
     private Integer workplaceType;
 
+    /**
+     *工位类型 1:采集工位; 2: 上货工位
+     */
+    @TableField(value = "workPlaceClass")
+    private Integer workPlaceClass;
+
 
     @TableField(exist = false)
     private String invName;

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -23,9 +23,7 @@
                 AND isPopular = #{isPopular}
             </if>
             <if test="busKey != null and busKey != ''">
-                AND (sys_workplace_document.documentTypeCode like concat('%', #{busKey}, '%')
+                AND  sys_workplace_document.busName like concat('%', #{busKey}, '%')
-                    or sys_workplace_document.busName like concat('%', #{busKey}, '%')
-                    )
             </if>
         </where>
         GROUP BY sys_workplace_document.documentTypeCode
@@ -60,9 +58,7 @@
                 AND sys_workplace_document.isPopular = #{isPopular}
             </if>
             <if test="busKey != null and busKey != ''">
-                AND (sys_workplace_document.documentTypeCode like concat('%', #{busKey}, '%')
+                AND sys_workplace_document.busName like concat('%', #{busKey}, '%')
-                    or sys_workplace_document.busName like concat('%', #{busKey}, '%')
-                    )
             </if>
         </where>
          ORDER BY sys_workplace_document.isPopular  desc  ,sys_workplace_document.number,sys_workplace_document.createTime