8/29 业务类型修改

src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java

@@ -9,12 +9,15 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoSplitDesOrder;
 import com.glxp.api.req.collect.AddInvDesDetaiRequest;
+import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest;
 import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest;
 import com.glxp.api.req.collect.IoSplitDesOrderRequest;
 import com.glxp.api.req.inout.AddTagCodeReqeust;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse;
 import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse;
 import com.glxp.api.res.collect.IoSplitDesOrderResponse;
+import com.glxp.api.service.collect.IoSplitDesOrderCodeService;
 import com.glxp.api.service.collect.IoSplitDesOrderDetailService;
 import com.glxp.api.service.collect.IoSplitDesOrderService;
 import org.springframework.validation.BindingResult;
@@ -34,6 +37,10 @@ public class IoFifoDesOrderController extends BaseController {
     IoSplitDesOrderService splitDesOrderService;
     @Resource
     IoSplitDesOrderDetailService splitDesOrderDetailService;
+    @Resource
+    IoSplitDesOrderCodeService ioSplitDesOrderCodeService;
+
+
 
     @GetMapping("/udiwms/collect/fifo/desOrder/filter")
     public BaseResponse filterOrder(IoSplitDesOrderRequest splitDesOrderRequest) {
@@ -63,6 +70,24 @@ public class IoFifoDesOrderController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @GetMapping("/udiwms/basic/collect/desOrder/code/detail")
+    public BaseResponse getCodeDetail(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest) {
+        if (StrUtil.isBlank(ioSplitDesOrderCodeDetailRequest.getOrderIdFk())) {
+            return ResultVOUtils.error(500, "单据号不能为空");
+        }
+        IoSplitDesOrder collectOrder = splitDesOrderService.getByBillNo(ioSplitDesOrderCodeDetailRequest.getOrderIdFk());
+        if (collectOrder == null) {
+            return ResultVOUtils.error(500, "未找到单据");
+        }
+        List<IoSplitDesOrderCodeDetailResponse> list = ioSplitDesOrderCodeService.filterList(ioSplitDesOrderCodeDetailRequest);
+        PageInfo<IoSplitDesOrderCodeDetailResponse> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<IoSplitDesOrderCodeDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     /**
      * 选入工位库存
      *

src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java

@@ -2,8 +2,13 @@ package com.glxp.api.dao.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.collect.IoSplitDesOrderCode;
+import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest;
+import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface IoSplitDesOrderCodeMapper extends BaseMapper<IoSplitDesOrderCode> {
-}
+    List<IoSplitDesOrderCodeDetailResponse> filterList(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest);
+}

src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java

@@ -117,7 +117,7 @@ public class SysWorkplaceDocumentEntity {
     private Integer orderCirType;
 
     /**
-     * 出入库方式： 1:入库; 2:出库
+     * 管理设备:： 1:是; 2:否
      */
     @TableField(value = "inoutType")
     private Integer inoutType;
@@ -128,6 +128,13 @@ public class SysWorkplaceDocumentEntity {
     @TableField(value = "remark")
     private String remark;
 
+    /**
+     * 作业类型 1拆零;2取整;3:全部
+     */
+    @TableField(value = "workplaceType")
+    private Integer workplaceType;
+
+
 
 
 

src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java

@@ -24,7 +24,7 @@ import lombok.NoArgsConstructor;
 public class IoSplitDesOrderCode implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
     @ApiModelProperty(value = "")
-    private Integer id;
+    private Long id;
 
     /**
      * 追溯码
@@ -150,4 +150,4 @@ public class IoSplitDesOrderCode implements Serializable {
     private String remark;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/glxp/api/req/collect/IoSplitDesOrderCodeDetailRequest.java

@@ -0,0 +1,55 @@
+package com.glxp.api.req.collect;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IoSplitDesOrderCodeDetailRequest extends ListPageRequest {
+
+
+    private Integer id;
+
+    private Long workPlaceCode;
+
+    private String orderIdFk;
+
+    private Integer invId;
+
+    private Long relId;
+
+    private String batchNo;
+
+    private String produceDate;
+
+    private String expireDate;
+
+    private Long supId;
+
+    private Integer count;
+
+    private Integer reCount;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String remark;
+    /**
+     * 产品通用名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 产品标识
+     */
+    private String nameCode;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    private String unionCode;
+}

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

@@ -122,6 +122,7 @@ public class SysWorkplaceDocumentResponse {
 
     private String remark;
 
+    private Integer workplaceType;
 
     private String innerBusName;
     private String outBusName;

src/main/java/com/glxp/api/res/collect/IoSplitDesOrderCodeDetailResponse.java

@@ -0,0 +1,92 @@
+package com.glxp.api.res.collect;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IoSplitDesOrderCodeDetailResponse {
+
+
+    private Integer id;
+
+    private Long workPlaceCode;
+
+    private String orderIdFk;
+
+    private Integer invId;
+
+    private Long relId;
+
+    private String batchNo;
+
+    private String produceDate;
+
+    private String expireDate;
+
+    private Long supId;
+
+    private Integer count;
+
+    private Integer reCount;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String remark;
+
+
+    /**
+     * 院内编码（第三方编码）
+     */
+    private String thrCode;
+
+    /**
+     * 医保编码
+     */
+    private String ybbm;
+
+    /**
+     * 收费编码
+     */
+    private String payFeeCode;
+
+    /**
+     * 产品通用名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 产品标识
+     */
+    private String nameCode;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+
+    /**
+     * 计量单位
+     */
+    private String measureUnit;
+
+    /**
+     * 单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码
+     */
+    private Integer tagStatus;
+
+    /**
+     * 赋码错误信息
+     */
+    private String tagMsg;
+    private String coName;
+    private String measname;
+    private String zczbhhzbapzbh;
+    private String manufactory;
+    private String supName;
+
+
+}

src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java

@@ -1,7 +1,11 @@
 package com.glxp.api.service.collect;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest;
+import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.entity.collect.IoSplitDesOrderCode;
@@ -9,4 +13,18 @@ import com.glxp.api.dao.collect.IoSplitDesOrderCodeMapper;
 @Service
 public class IoSplitDesOrderCodeService extends ServiceImpl<IoSplitDesOrderCodeMapper, IoSplitDesOrderCode> {
 
+    @Resource
+    IoSplitDesOrderCodeMapper ioSplitDesOrderCodeMapper;
+
+    public List<IoSplitDesOrderCodeDetailResponse> filterList(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest) {
+        if (ioSplitDesOrderCodeDetailRequest == null) {
+            return Collections.emptyList();
+        }
+        if (ioSplitDesOrderCodeDetailRequest.getPage() != null) {
+            int offset = (ioSplitDesOrderCodeDetailRequest.getPage() - 1) * ioSplitDesOrderCodeDetailRequest.getLimit();
+            PageHelper.offsetPage(offset, ioSplitDesOrderCodeDetailRequest.getLimit());
+        }
+        List<IoSplitDesOrderCodeDetailResponse> list = ioSplitDesOrderCodeMapper.filterList(ioSplitDesOrderCodeDetailRequest);
+        return list;
+    }
 }

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderCodeMapper.xml

@@ -26,8 +26,14 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, code, errUdiCode, orderIdFk, bizIdFk, relId, batchNo, produceDate, expireDate, 
+    id, code, errUdiCode, orderIdFk, bizIdFk, relId, batchNo, produceDate, expireDate,
-    serialNo, supId, workPlaceCode, createTime, updateTime, `createUser`, updateUser, 
+    serialNo, supId, workPlaceCode, createTime, updateTime, `createUser`, updateUser,
     `count`, reCount, remark
   </sql>
-</mapper>
+    <select id="filterList" parameterType="com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest"
+            resultType="com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse">
+            select isdoc.*
+            from io_split_des_order_code isdoc
+            left join io_split_des_order isdo on isdo.billNo = isdoc.orderIdFk
+    </select>
+</mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -4300,3 +4300,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeLevelCount',
 CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount',
                          'int NULL DEFAULT b''1'' COMMENT ''使用是当前层级包含计量单元数量''',
                          2);
+
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'workplaceType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''作业类型 1拆零;2取整;3:全部''',
+                         1);