备份

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

@@ -18,6 +18,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.service.collect.IoCollectOrderBizService;
 import com.glxp.api.service.collect.IoCollectOrderService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -87,6 +89,45 @@ public class IoCollectOrderController extends BaseController {
     }
 
 
+    /**
+     * 单据挂起
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/order/draft")
+    public BaseResponse saveDraftOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+        IoCollectOrder collectOrder = new IoCollectOrder();
+        BeanUtils.copyProperties(collectOrderRequest, collectOrder);
+        collectOrder.setTagStatus(-1);
+        collectOrder.setUpdateTime(new Date());
+        collectOrder.setUpdateUser(getUserId());
+        collectOrderService.updateById(collectOrder);
+        return ResultVOUtils.success();
+    }
+
+    /**
+     * 单据挂起
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/order/finish")
+    public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+
+        //1.校验是否全部自动赋码
+
+        //2.校验扫码是否完成
+
+
+        IoCollectOrder collectOrder = new IoCollectOrder();
+        BeanUtils.copyProperties(collectOrderRequest, collectOrder);
+        collectOrder.setTagStatus(3);
+        collectOrder.setUpdateTime(new Date());
+        collectOrder.setUpdateUser(getUserId());
+        collectOrderService.updateById(collectOrder);
+        return ResultVOUtils.success();
+    }
+
+
     @PostMapping("/udiwms/basic/collect/order/bindWork")
     public BaseResponse bindWork(@RequestBody CollectOrderBindWorkRequest bindWorkRequest) {
 

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

@@ -48,7 +48,14 @@ public class IoSplitController extends BaseController {
 
     @Resource
     BasicSkPrescribeDiService basicSkPrescribeDiService;
-
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+    @Resource
+    IoSplitFifoCodeService splitFifoCodeService;
+    @Resource
+    BasicSkPrescribeService basicSkPrescribeService;
+    @Resource
+    BasicSkPrescribeItemCodeService basicSkPrescribeItemCodeService;
     /**
      * 器械拆零按码查询
      *
@@ -106,14 +113,7 @@ public class IoSplitController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @Resource
+
-    UdiRelevanceService udiRelevanceService;
-    @Resource
-    IoSplitFifoCodeService splitFifoCodeService;
-    @Resource
-    BasicSkPrescribeService basicSkPrescribeService;
-    @Resource
-    BasicSkPrescribeItemCodeService basicSkPrescribeItemCodeService;
 
     /**
      * 器械拆零处方赋码（手动赋码)

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

@@ -119,9 +119,9 @@ public class IoCollectOrder implements Serializable {
      */
     @TableField(value = "updateUser")
     @ApiModelProperty(value = "更新人")
-    private String updateUser;
+    private Long updateUser;
     /**
-     * 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常
+     * 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态
      */
     @TableField(value = "tagStatus")
     private Integer tagStatus;

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

@@ -79,7 +79,7 @@ public class CollectOrderRequest extends ListPageRequest {
     /**
      * 更新人
      */
-    private String updateUser;
+    private Long updateUser;
 
 
 }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -145,7 +145,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     IoCollectOrderCodeAutoService collectOrderCodeAutoService;
 
     /**
-     * 处方自动赋码
+     * 单据自动赋码
      */
     public void orderAutoTagCode(IoCollectOrder collectOrder) {