Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql

src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java

@@ -45,7 +45,6 @@ public class BasicSkPrescribeController extends BaseController {
     @Resource
     BasicSkPrescribeItemService basicSkPrescribeItemService;
 
-
     @GetMapping("/udiwms/basic/sk/prescribe/filter")
     public BaseResponse filterSicker(BasicSkPrescribeRequest basicSkPrescribeRequest) {
         List<BasicSkPrescribeResponse> basicSkPrescribeResponses = basicSkPrescribeService.filterList(basicSkPrescribeRequest);
@@ -61,7 +60,7 @@ public class BasicSkPrescribeController extends BaseController {
         if (StrUtil.isBlank(prescribeCode)) {
             return ResultVOUtils.error(500, "缺少请求标识");
         }
-        BasicSkPrescribeEntity prescribe = basicSkPrescribeService.getById(prescribeCode);
+        BasicSkPrescribeEntity prescribe = basicSkPrescribeService.getByCode(prescribeCode);
         if (prescribe == null) {
             return ResultVOUtils.error(500, "未找到处方");
         }
@@ -94,7 +93,7 @@ public class BasicSkPrescribeController extends BaseController {
     @PostMapping("/udiwms/basic/sk/prescribe/deleteDataByCode")
     public BaseResponse deleteDataByCode(@RequestBody GetSickPrescribeRequest getSickPrescribeRequest, BindingResult bindingResult) {
         String code = getSickPrescribeRequest.getCode();
-        if (StrUtil.isBlank(code)){
+        if (StrUtil.isBlank(code)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
         basicSkPrescribeService.removeById(code);
@@ -112,4 +111,15 @@ public class BasicSkPrescribeController extends BaseController {
         basicSkPrescribeService.saveOrUpdateBatch(list);
         return ResultVOUtils.success();
     }
+
+
+    @PostMapping("/udiwms/basic/sk/prescribe/bindWork")
+    public BaseResponse bindWork(@RequestBody PrescribeBindWorkRequest bindWorkRequest, BindingResult bindingResult) {
+
+        for (BasicSkPrescribeEntity prescribe : bindWorkRequest.getPrescribeList()) {
+            prescribe.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode());
+        }
+        basicSkPrescribeService.updateBatchById(bindWorkRequest.getPrescribeList());
+        return ResultVOUtils.success("绑定成功");
+    }
 }

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

@@ -77,7 +77,7 @@ public class IoSplitController extends BaseController {
      */
     @GetMapping("/udiwms/ioSplit/material/tagCode/filter")
     public BaseResponse filterByTagCode(IoSplitDetailCodeRequest splitDetailCodeRequest,
-                                          BindingResult bindingResult) {
+                                        BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }

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

@@ -28,12 +28,11 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName(value = "basic_sk_prescribe")
 public class BasicSkPrescribeEntity {
-
+    @TableId(value = "id", type = IdType.AUTO)
-
+    private Integer id;
     /**
      * 处方编码
      */
-    @TableId(value = "code")
     @ApiModelProperty(value = "处方编码")
     private String code;
 

src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PrescribeBindWorkRequest {
+
+    List<BasicSkPrescribeEntity> prescribeList;
+    String workplaceCode;
+}

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

@@ -12,6 +12,8 @@ import java.util.List;
 @Data
 public class BasicSkPrescribeResponse {
 
+
+    private Integer id;
     /**
      * 处方编码
      */

src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java

@@ -84,4 +84,14 @@ public class IoSplitCodeDetailResponse {
     private String price;
     private String amount;
     private String ggxh;
+
+
+    /**
+     * 扫码数量
+     */
+    private Integer scanCount;
+    /**
+     * 扫码实际数量
+     */
+    private Integer scanRelCount;
 }

src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.basic;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -40,6 +41,13 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
     BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
     @Resource
     BasicSkPrescribeDiService basicSkPrescribeDiService;
+    @Resource
+    BasicSkPrescribeMapper basicSkPrescribeMapper;
+
+
+    public BasicSkPrescribeEntity getByCode(String code) {
+        return basicSkPrescribeMapper.selectOne(new LambdaQueryWrapper<BasicSkPrescribeEntity>().eq(BasicSkPrescribeEntity::getCode, code).last("limit 1"));
+    }
 
     public List<BasicSkPrescribeResponse> filterList(BasicSkPrescribeRequest basicSkPrescribeRequest) {
         if (basicSkPrescribeRequest == null) {

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

@@ -4124,4 +4124,11 @@ CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagMsg',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''处方赋码错误信息''',
                          1);
 
+
+CALL Pro_Temp_ColumnWork('basic_sk_prescribe', 'id',
+                         'int NOT NULL AUTO_INCREMENT',
+                         1);
+
+
+
 CALL Pro_Temp_ColumnWork('basic_products', 'cphhhbh', 'varchar(255)', 1);