损耗出库添加产品

src/main/java/com/glxp/api/constant/Constant.java

@@ -44,6 +44,8 @@ public class Constant {
 
     public static final String SPLIT_ORDER = "WD";      //工位作业扫码生成出入库单
 
+    public static final String SPLIT_DES_ORDER = "DES";      //工位作业扫码生成出入库单
+
 
     /**
      * 盘点单据前缀

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

@@ -2,21 +2,29 @@ package com.glxp.api.controller.collect;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 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.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.IoSplitDesOrderDetailResponse;
 import com.glxp.api.res.collect.IoSplitDesOrderResponse;
 import com.glxp.api.service.collect.IoSplitDesOrderDetailService;
 import com.glxp.api.service.collect.IoSplitDesOrderService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -27,7 +35,7 @@ public class IoFifoDesOrderController extends BaseController {
     @Resource
     IoSplitDesOrderDetailService splitDesOrderDetailService;
 
-    @GetMapping("/udiwms/basic/collect/desOrder/filter")
+    @GetMapping("/udiwms/collect/fifo/desOrder/filter")
     public BaseResponse filterOrder(IoSplitDesOrderRequest splitDesOrderRequest) {
         List<IoSplitDesOrderResponse> orderResponses = splitDesOrderService.filterList(splitDesOrderRequest);
         PageInfo<IoSplitDesOrderResponse> pageInfo = new PageInfo<>(orderResponses);
@@ -38,7 +46,7 @@ public class IoFifoDesOrderController extends BaseController {
     }
 
 
-    @GetMapping("/udiwms/basic/collect/desOrder/detail")
+    @GetMapping("/udiwms/collect/fifo/desOrder/detail")
     public BaseResponse detail(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest) {
         if (StrUtil.isBlank(splitDesOrderDetailRequest.getOrderIdFk())) {
             return ResultVOUtils.error(500, "单据号不能为空");
@@ -54,4 +62,21 @@ public class IoFifoDesOrderController extends BaseController {
         pageSimpleResponse.setList(list);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
+    /**
+     * 选入工位库存
+     *
+     * @return
+     */
+    @PostMapping("/udiwms/collect/fifo/desOrder/addInv")
+    public BaseResponse addInv(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest,
+                               BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        IoSplitDesOrder splitDesOrder = splitDesOrderService.addInv(addInvDesDetaiRequest);
+        return ResultVOUtils.success(splitDesOrder);
+    }
+
+
 }

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

@@ -25,7 +25,7 @@ public class IoSplitDesOrder implements Serializable {
 
     @TableField(value = "billNo")
     @ApiModelProperty(value = "")
-    private Integer billNo;
+    private String billNo;
 
     @TableField(value = "busType")
     @ApiModelProperty(value = "")
@@ -33,7 +33,7 @@ public class IoSplitDesOrder implements Serializable {
 
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     @TableField(value = "createTime")
     @ApiModelProperty(value = "")

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

@@ -0,0 +1,12 @@
+package com.glxp.api.req.collect;
+
+import com.glxp.api.entity.inout.IoSplitFifoInv;
+import lombok.Data;
+
+@Data
+public class AddInvDesDetaiRequest {
+
+    private String billNo;
+    private IoSplitFifoInv splitFifoInv;
+
+}

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

@@ -10,11 +10,11 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
 
     private Integer id;
 
-    private Integer billNo;
+    private String billNo;
 
     private String busType;
 
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     private Date createTime;
 
@@ -30,4 +30,7 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
 
     private String updateUser;
 
+
+
+
 }

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

@@ -134,7 +134,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         //2.校验是否处方单UDI码
         if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) {
             if (StrUtil.isEmpty(addTagCodeReqeust.getBillNo())) {
-                String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"));
+                String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_ORDER, "yyyyMMdd"));
                 collectOrder = IoCollectOrder.builder()
                         .billNo(orderNo)
                         .busType(sysWorkplaceDocumentEntity.getDocumentTypeCode())

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

@@ -1,16 +1,24 @@
 package com.glxp.api.service.collect;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.req.collect.AddInvDesDetaiRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.collect.IoSplitDesOrderRequest;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.res.collect.IoSplitDesOrderResponse;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
+import org.apache.groovy.util.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,6 +30,8 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
 
     @Resource
     IoSplitDesOrderMapper splitDesOrderMapper;
+    @Resource
+    GennerOrderUtils gennerOrderUtils;
 
     public List<IoSplitDesOrderResponse> filterList(IoSplitDesOrderRequest splitDesOrderRequest) {
         if (splitDesOrderRequest == null) {
@@ -39,4 +49,24 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
     public IoSplitDesOrder getByBillNo(String billNo) {
         return splitDesOrderMapper.selectOne(new LambdaQueryWrapper<IoSplitDesOrder>().eq(IoSplitDesOrder::getBillNo, billNo).last("limit 1"));
     }
+
+
+    public IoSplitDesOrder addInv(AddInvDesDetaiRequest addInvDesDetaiRequest) {
+
+        IoSplitDesOrder collectOrder;
+        if (StrUtil.isNotEmpty(addInvDesDetaiRequest.getBillNo())) {
+            collectOrder = getByBillNo(addInvDesDetaiRequest.getBillNo());
+        } else {
+            collectOrder = new IoSplitDesOrder();
+            String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd"));
+            collectOrder.setBillNo(orderNo);
+
+
+
+        }
+
+        // TODO 添加到单据详情
+
+        return collectOrder;
+    }
 }