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

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

@@ -706,6 +706,8 @@ public class IoCodeTempController extends BaseController {
             String unitFk = null;
             if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
                 unitFk = addOrderRequest.getFromCorp();
+            } else if (StrUtil.isNotEmpty(addOrderRequest.getSelectSupId())) {
+                unitFk = addOrderRequest.getSelectSupId();
             }
             //产品是否可以以使用单元入库
             udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);

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

@@ -24,6 +24,7 @@ import com.glxp.api.req.inout.*;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.PdaBusOrderResponse;
 import com.glxp.api.service.auth.InvBusUserService;
@@ -40,6 +41,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -135,6 +137,21 @@ public class IoOrderController extends BaseController {
             filterOrderRequest.setFromCorp(customerId);
         }
         List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
+        for (IoOrderResponse ioOrderResponse : list) {
+            FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
+            filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
+            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
+            BigDecimal amount=new BigDecimal(0.00);
+            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+                if(ioOrderDetailCodeRespons.getCount() != 0) {
+                    amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+                }
+            }
+            ioOrderResponse.setAllAmount(amount);
+
+
+        }
+
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);

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

@@ -27,14 +27,12 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
-import com.glxp.api.req.inout.AddBizProductReqeust;
+import com.glxp.api.req.inout.*;
-import com.glxp.api.req.inout.BizBindUpdateRequest;
-import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
-import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
@@ -56,6 +54,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -510,14 +509,14 @@ public class IoOrderDetailBizController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
-    @GetMapping("/udiwms/inout/bizDetail/filterListInv")
+//    @GetMapping("/udiwms/inout/bizDetail/filterListInv")
-    public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
+//    public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
-        List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
+//        List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
-        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
+//        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
-        ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
+//        ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
-        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+//        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.page(pageInfo);
+//        return ResultVOUtils.page(pageInfo);
-    }
+//    }
 
     @GetMapping("/udiwms/inout/bizDetail/filterListInvoice")
     public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) {
@@ -556,9 +555,9 @@ public class IoOrderDetailBizController extends BaseController {
     @Log(title = "发票管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
 
-        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId().longValue());
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
         //更改 登记状态
-        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
+        IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
 
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
 
@@ -572,7 +571,7 @@ public class IoOrderDetailBizController extends BaseController {
         if (list == null && list.size() == 0) {
             ioOrderDetailBizEntity.setRegStatus(false);
         }
-        orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success();
 
 
@@ -596,29 +595,38 @@ public class IoOrderDetailBizController extends BaseController {
 
     @PostMapping("/udiwms/inout/biz/insertInvoice")
     @Log(title = "发票管理", businessType = BusinessType.INSERT)
-    public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+    public BaseResponse insertInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) {
-
+
-        IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
+        for (IoOrderDetailBizEntity ioOrderDetailBizEntity : ioOrderInvoice.getList()) {
-        ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
+            IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
-        ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + "");
+            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
-        ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
+            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + "");
-        ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
+            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
-        ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
+            ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
-        ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
+            ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
-        ioOrderInvoiceEntity.setCreateTime(new Date());
+            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
-        ioOrderInvoiceEntity.setUpdateTime(new Date());
+            ioOrderInvoiceEntity.setCreateTime(new Date());
-        ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
+            ioOrderInvoiceEntity.setUpdateTime(new Date());
-        boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
+            ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
-
+            ioOrderInvoiceEntity.setMachineNo(ioOrderInvoice.getMachineNo());
+            ioOrderInvoiceEntity.setInvoiceCode(ioOrderInvoice.getInvoiceCode());
+            ioOrderInvoiceEntity.setInvoiceEncode(ioOrderInvoice.getInvoiceEncode());
+            ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate());
+            ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice());
+            ioOrderInvoiceEntity.setRemark(ioOrderInvoice.getRemark());
+            ioOrderInvoiceEntity.setLicenseUrl(ioOrderInvoice.getLicenseUrl());
+            boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
+        }
         return ResultVOUtils.success("成功");
 
     }
 
     @PostMapping("/udiwms/inout/biz/updateorderBiz")
-    public BaseResponse updateorderBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+    public BaseResponse updateorderBiz(@RequestBody  List<IoOrderDetailCodeEntity> list) {
-        ioOrderDetailBizEntity.setRegStatus(true);
+        for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) {
-        orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+            ioOrderDetailBizEntity.setRegStatus(true);
-
+            orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        }
         return ResultVOUtils.success("成功");
 
     }
@@ -630,25 +638,28 @@ public class IoOrderDetailBizController extends BaseController {
      * @return
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
-    public BaseResponse filterBizOrderList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+    public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
-        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
-        for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
+        for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+            ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
-            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
+            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
+            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailCodeRespons.getId());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
             for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
-                if (StrUtil.isNotEmpty(obj.getInvoiceCode())) {
+                if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
-                    msg += "," + obj.getInvoiceCode();
+                    msg += "," + obj.getInvoiceEncode();
                 }
             }
             if (msg.length() > 1) {
                 msg = msg.substring(1);
             }
-            ioOrderDetailBizResponse.setInvoiceCodes(msg);
+            ioOrderDetailCodeRespons.setInvoiceCodes(msg);
         }
-        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+        PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
         return ResultVOUtils.page(pageInfo);
     }
 
 }
+

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

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inout;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -11,10 +12,7 @@ import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.idc.service.FileService;
-import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
-import com.glxp.api.service.inout.IoOrderInvoiceService;
-import com.glxp.api.service.inout.IoOrderService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,9 +34,9 @@ public class IoOrderInvoiceController {
     @PostMapping("/udiwms/inout/order/refrshInvoice")
     @Log(title = "发票", businessType = BusinessType.INSERT)
     public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
-        BaseResponse<List<IoOrderInvoiceEntity>> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
+        BaseResponse baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
         if (baseResponse.getCode() == 20000) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = baseResponse.getData();
+            List<IoOrderInvoiceEntity> orderInvoiceEntities = BeanUtil.toBean(baseResponse.getData(),List.class);
             if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
                 List<String> syncFiles = new ArrayList<>();
                 for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {

src/main/java/com/glxp/api/controller/inv/InvPlaceController.java

@@ -65,6 +65,35 @@ public class InvPlaceController {
         return invPlaceService.bindInvSpace(bindInvSpaceRequest);
     }
 
+    /**
+     * 绑定货位接口
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @PostMapping("/spms/inv/product/bindInvOrderSpace")
+    public BaseResponse bindInvOrderSpace(@RequestBody  BindInvSpaceRequest bindInvSpaceRequest) {
+        if (null == bindInvSpaceRequest) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invPlaceService.bindInvOrderSpace(bindInvSpaceRequest);
+    }
+
+
+    /**
+     * 变更货位绑定货位接口
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @PostMapping("/spms/inv/product/bindCheckInvSpace")
+    public BaseResponse bindCheckInvSpace(@RequestBody  BindInvSpaceRequest bindInvSpaceRequest) {
+        if (null == bindInvSpaceRequest) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invPlaceService.bindInvSpace(bindInvSpaceRequest);
+    }
+
 
     /**
      * 更换货位接口
@@ -95,7 +124,7 @@ public class InvPlaceController {
     }
 
     /**
-     * 查询库存产品信息
+     * 按物资
      *
      * @param bindInvSpaceRequest
      * @return
@@ -114,6 +143,38 @@ public class InvPlaceController {
 
     }
 
+
+
+    /**
+     * 按单号
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/getInvProductOrderInfo")
+    private BaseResponse getInvProductOrderInfo(BindInvSpaceRequest bindInvSpaceRequest) {
+        return invPlaceOrderService.bindInvSpaceAll(bindInvSpaceRequest);
+    }
+
+    /**
+     * 变更货位
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/getCheckInvProductInfo")
+    private BaseResponse getCheckInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) {
+        //判断有没有库存
+        String msg=invPlaceService.checkCount(bindInvSpaceRequest);
+        if(StrUtil.isEmpty(msg)){
+            //有库存做插入货位号
+            return invPlaceOrderService.bindInvSpaceOne(bindInvSpaceRequest);
+        }else{
+            return ResultVOUtils.error(500, msg);
+        }
+
+    }
+
     /**
      * 从库存详情查询单据列表
      *

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -3,7 +3,9 @@ package com.glxp.api.dao.inout;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,7 +21,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
      */
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
 
-    List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+    List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -191,5 +191,9 @@ public class IoOrderDetailCodeEntity {
     @TableField(exist = false)
     private String errMsg;
 
+    @TableField(value = "regStatus")
+    private boolean regStatus;
+
+
 
 }

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName(value = "io_order_invoice")
@@ -108,6 +109,11 @@ public class IoOrderInvoiceEntity {
     @TableField(exist = false)
     private Integer  regId;
 
+
+    @TableField(exist = false)
+    private List<IoOrderDetailBizEntity> list;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/entity/inv/InvPreInProductDetailEntity.java

@@ -87,20 +87,20 @@ public class InvPreInProductDetailEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
     @TableField(value = "inCount")
-    private int inCount;
+    private Integer inCount;
 
 
     @TableField(value = "outCount")
-    private int outCount;
+    private Integer outCount;
 
 
     /**

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -1,8 +1,6 @@
 package com.glxp.api.http.sync;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -11,7 +9,6 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicExportTypeEnum;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
-import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.IOOrderStatusEntity;
 import com.glxp.api.entity.system.SyncDataSetEntity;
@@ -139,11 +136,11 @@ public class SpGetHttpClient {
     }
 
 
-    public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
+    public BaseResponse getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
         String json = JSONUtil.toJsonStr(refreshInoiceRequest);
         String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());
-        BaseResponse<List<IoOrderInvoiceEntity>> response =
+        BaseResponse response =
-                JSONObject.parseObject(result, new TypeReference<BaseResponse<List<IoOrderInvoiceEntity>>>() {
+                JSONObject.parseObject(result, new TypeReference<BaseResponse>() {
                 });
         return response;
     }

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -28,6 +28,7 @@ public class AddOrderRequest {
     private Integer orderType;
     private String remark;
     private String checkPreInOrders;
+    private String selectSupId;
 
     //    预验收货位
     private String checkPreInSpaceCode;

src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java

@@ -8,6 +8,7 @@ import lombok.Data;
  */
 @Data
 public class FilterOrderDetailCodeRequest extends ListPageRequest {
+    private Long relId;
 
     /**
      * 单据号
@@ -39,4 +40,6 @@ public class FilterOrderDetailCodeRequest extends ListPageRequest {
      */
     private String productName;
 
+    private Long bizIdFk;
+
 }

src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java

@@ -1,15 +1,8 @@
 package com.glxp.api.req.inout;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
-import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
-import com.glxp.api.entity.purchase.SupCertSetEntity;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author : zhangsan
@@ -67,7 +60,7 @@ public class IoOrderInvoiceRequest {
 
     private String remark;
 
-    private Long bizIdFk;
+    private Integer bizIdFk;
 
     public static final String COL_ID = "id";
 

src/main/java/com/glxp/api/req/inv/FilterInvPlaceOrderRequest.java

@@ -4,7 +4,7 @@ import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 /**
- * 物资上架记录接口查询参数
+ * 库存摆放接口参数
  */
 @Data
 public class FilterInvPlaceOrderRequest extends ListPageRequest {
@@ -29,4 +29,13 @@ public class FilterInvPlaceOrderRequest extends ListPageRequest {
 
     private String zczbhhzbapzbh;
 
+
+    private Long relId;
+    private String supId;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+    private int count;
+
+
 }

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

@@ -1,6 +1,5 @@
 package com.glxp.api.res.inout;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -162,4 +161,13 @@ public class IoOrderDetailCodeResponse {
 
     private int orderCount;
 
+    private String invoiceCodes;
+
+    private Integer sucCount;
+
+    private boolean regStatus;
+
+    //金额
+    private BigDecimal amount;
+
 }

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

@@ -3,6 +3,7 @@ package com.glxp.api.res.inout;
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -220,9 +221,16 @@ public class IoOrderResponse {
     private Integer processStatus;
     private int inCodeStatus;
 
+    private Integer allCout;
+
+    private Integer partCount;
+
     private Date checkTime;
     private String checkUserName;
 
+    //总金额
+    private BigDecimal allAmount;
+
 
     /**
      * 校验信息

src/main/java/com/glxp/api/res/inv/BindInvSpaceRequest.java

@@ -41,7 +41,7 @@ public class BindInvSpaceRequest {
     private String code;
 
     /**
-     * 上架方式     1：按物资上架  2：按单上架
+     * 上架方式     1：按物资上架  2：按单上架 3：变更货位
      */
     private Integer type;
 
@@ -50,6 +50,8 @@ public class BindInvSpaceRequest {
      */
     private String orderId;
 
+    private String oId;
+
 
     private String changeSpaceCode;
 

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

@@ -2,7 +2,9 @@ package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 
 import java.util.List;
@@ -35,7 +37,7 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
 
-    List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+    List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
 

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

@@ -3,7 +3,6 @@ package com.glxp.api.service.inout;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -49,4 +48,7 @@ public interface IoOrderDetailCodeService {
      * @return
      */
     List<IoOrderDetailCodeResponse> getDetailCodeResponse(List<IoOrderDetailCodeEntity> orderEntityList);
+
+    Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity);
+
 }

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

@@ -1,7 +1,6 @@
 package com.glxp.api.service.inout;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 
@@ -12,7 +11,7 @@ public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
 
     List<IoOrderInvoiceEntity> findByBillNo(String billNo);
 
-    boolean deleteByInvId(Long id);
+    boolean deleteByInvId(String id);
 
     boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -10,7 +10,9 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
@@ -116,14 +118,14 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+    public List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
-        if (null == orderDetailBizRequest) {
+        if (null == OrderDetailCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+        if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
-            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+            PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
         }
-        return ioOrderDetailBizDao.getfilterList(orderDetailBizRequest);
+        return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
     }
 
     @Override

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -118,4 +118,10 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         }
         return list;
     }
+
+    @Override
+    public Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity) {
+        return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity)>0;
+    }
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java

@@ -2,15 +2,12 @@ package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.dao.inout.IoCodeRelMapper;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -30,7 +27,7 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
 
 
     @Override
-    public boolean deleteByInvId(Long id) {
+    public boolean deleteByInvId(String id) {
         return this.ioOrderInvoiceMapper.deleteById(id) > 0;
     }
 

src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java

@@ -24,6 +24,9 @@ public interface InvPlaceOrderService {
     //单条绑定货位
     BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest);
 
+    //批量绑定货位
+    BaseResponse bindInvSpaceAll(BindInvSpaceRequest bindInvSpaceRequest);
+
 
     List<InvPlaceOrderDetailResponse> filterInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest);
 }

src/main/java/com/glxp/api/service/inv/InvPlaceService.java

@@ -29,6 +29,13 @@ public interface InvPlaceService {
      */
     BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
 
+    /**
+     * 绑定货位
+     *
+     * @param bindInvSpaceRequest
+     */
+    BaseResponse bindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest);
+
 
     /**
      * 更换货位

src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -128,6 +129,9 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
             QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("code", bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+            }
             ew.last("limit 1");
             InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
             relId = invPreInProductDetailEntity.getRelId();
@@ -140,6 +144,9 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
             QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("code", bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+            }
             ew.last("limit 1");
             InvPreProductDetailEntity invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew);
             relId = invPreInProductDetailEntity.getRelId();
@@ -152,6 +159,9 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) {
             QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("code", bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+            }
             ew.last("limit 1");
             InvProductDetailEntity invPreInProductDetailEntity = invProductDetailDao.selectOne(ew);
             relId = invPreInProductDetailEntity.getRelId();
@@ -187,13 +197,17 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
             invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
             invPlaceOrderDetailEntity.setRecordId(recordId);
             invPlaceOrderDetailEntity.setBatchNo(batchNo);
-            invPlaceOrderDetailEntity.setRelId(relId+"");
+            invPlaceOrderDetailEntity.setRelId(relId + "");
             invPlaceOrderDetailEntity.setNameCode(nameCode);
             invPlaceOrderDetailEntity.setExpireDate(expireDate);
             invPlaceOrderDetailEntity.setProduceDate(produceDate);
             invPlaceOrderDetailEntity.setSupId(supId);
             invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
-            invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            if(bindInvSpaceRequest.getType()==3){
+                invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
+            }else{
+                invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            }
             invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode());
             invPlaceOrderDetailEntity.setSerialNo(serialNo);
             invPlaceOrderDetailEntity.setCount(1);
@@ -215,12 +229,16 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
                 invPlaceOrderDetailEntity.setRecordId(bindInvSpaceRequest.getOrderId());
                 invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
                 invPlaceOrderDetailEntity.setBatchNo(batchNo);
-                invPlaceOrderDetailEntity.setRelId(relId+"");
+                invPlaceOrderDetailEntity.setRelId(relId + "");
                 invPlaceOrderDetailEntity.setNameCode(nameCode);
                 invPlaceOrderDetailEntity.setExpireDate(expireDate);
                 invPlaceOrderDetailEntity.setProduceDate(produceDate);
                 invPlaceOrderDetailEntity.setSupId(supId);
-                invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+                if(bindInvSpaceRequest.getType()==3){
+                    invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
+                }else{
+                    invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+                }
                 invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode());
                 invPlaceOrderDetailEntity.setCount(1);
                 invPlaceOrderDetailEntity.setSerialNo(serialNo);
@@ -232,6 +250,131 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         return ResultVOUtils.success(recordId);
     }
 
+    @Override
+    public BaseResponse bindInvSpaceAll(BindInvSpaceRequest bindInvSpaceRequest) {
+
+        List<FilterInvPlaceOrderRequest> filterInvPlaceOrderRequestList = new ArrayList<>();
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", bindInvSpaceRequest.getInvCode()));
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
+            ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("mainAction", "WareHouseIn");
+            List<InvPreInProductDetailEntity> invPreInProductDetailEntityList = invPreInProductDetailDao.selectList(ew);
+            if (invPreInProductDetailEntityList.size() == 0) {
+                return ResultVOUtils.error(999, "该单号不存在可以上架产品！");
+            }
+            for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntityList) {
+                FilterInvPlaceOrderRequest filterInvPlaceOrderRequest = new FilterInvPlaceOrderRequest();
+                filterInvPlaceOrderRequest.setBatchNo(invPreInProductDetailEntity.getBatchNo());
+                filterInvPlaceOrderRequest.setCount(invPreInProductDetailEntity.getReCount());
+                filterInvPlaceOrderRequest.setExpireDate(invPreInProductDetailEntity.getExpireDate());
+                filterInvPlaceOrderRequest.setRelId(invPreInProductDetailEntity.getRelId());
+                filterInvPlaceOrderRequest.setNameCode(invPreInProductDetailEntity.getNameCode());
+                filterInvPlaceOrderRequest.setSerialNo(invPreInProductDetailEntity.getSerialNo());
+                filterInvPlaceOrderRequest.setProduceDate(invPreInProductDetailEntity.getProduceDate());
+                filterInvPlaceOrderRequest.setSupId(invPreInProductDetailEntity.getSupId());
+                filterInvPlaceOrderRequest.setCode(invPreInProductDetailEntity.getCode());
+                filterInvPlaceOrderRequestList.add(filterInvPlaceOrderRequest);
+            }
+
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+            QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
+            ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("mainAction", "WareHouseIn");
+            List<InvPreProductDetailEntity> invPreProductDetailEntityList = invPreProductDetailDao.selectList(ew);
+            for (InvPreProductDetailEntity invPreProductDetailEntity : invPreProductDetailEntityList) {
+                FilterInvPlaceOrderRequest filterInvPlaceOrderRequest = new FilterInvPlaceOrderRequest();
+                filterInvPlaceOrderRequest.setBatchNo(invPreProductDetailEntity.getBatchNo());
+                filterInvPlaceOrderRequest.setExpireDate(invPreProductDetailEntity.getExpireDate());
+                filterInvPlaceOrderRequest.setRelId(invPreProductDetailEntity.getRelId());
+                filterInvPlaceOrderRequest.setNameCode(invPreProductDetailEntity.getNameCode());
+                filterInvPlaceOrderRequest.setSerialNo(invPreProductDetailEntity.getSerialNo());
+                filterInvPlaceOrderRequest.setProduceDate(invPreProductDetailEntity.getProduceDate());
+                filterInvPlaceOrderRequest.setCount(invPreProductDetailEntity.getReCount());
+                filterInvPlaceOrderRequest.setSupId(invPreProductDetailEntity.getSupId());
+                filterInvPlaceOrderRequest.setCode(invPreProductDetailEntity.getCode());
+                filterInvPlaceOrderRequestList.add(filterInvPlaceOrderRequest);
+            }
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) {
+            QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
+            ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("mainAction", "WareHouseIn");
+            List<InvProductDetailEntity> invProductDetailEntityList = invProductDetailDao.selectList(ew);
+            for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntityList) {
+                FilterInvPlaceOrderRequest filterInvPlaceOrderRequest = new FilterInvPlaceOrderRequest();
+                filterInvPlaceOrderRequest.setBatchNo(invProductDetailEntity.getBatchNo());
+                filterInvPlaceOrderRequest.setExpireDate(invProductDetailEntity.getExpireDate());
+                filterInvPlaceOrderRequest.setRelId(invProductDetailEntity.getRelId());
+                filterInvPlaceOrderRequest.setNameCode(invProductDetailEntity.getNameCode());
+                filterInvPlaceOrderRequest.setCount(invProductDetailEntity.getReCount());
+                filterInvPlaceOrderRequest.setSerialNo(invProductDetailEntity.getSerialNo());
+                filterInvPlaceOrderRequest.setProduceDate(invProductDetailEntity.getProduceDate());
+                filterInvPlaceOrderRequest.setSupId(invProductDetailEntity.getSupId());
+                filterInvPlaceOrderRequest.setCode(invProductDetailEntity.getCode());
+                filterInvPlaceOrderRequestList.add(filterInvPlaceOrderRequest);
+            }
+        }
+
+
+        //判断是不是第一次进行添加 是就插入一条主表
+        String recordId = "";
+        if (StrUtil.isEmpty(bindInvSpaceRequest.getOrderId())) {
+            //操作人ID
+            String userId = customerService.getUserIdStr();
+
+            recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
+            InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
+            orderEntity.setId(IdUtil.getSnowflakeNextId());
+            orderEntity.setRecordId(recordId);
+            orderEntity.setType(2);
+            orderEntity.setOrderId(bindInvSpaceRequest.getOId());
+            orderEntity.setCreateUser(userId);
+            orderEntity.setCreateTime(new Date());
+            orderEntity.setUpdateTime(new Date());
+            invPlaceOrderDao.insert(orderEntity);
+            //插入附表
+            for (FilterInvPlaceOrderRequest filterInvPlaceOrderRequest : filterInvPlaceOrderRequestList) {
+                InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
+                invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
+                invPlaceOrderDetailEntity.setRecordId(recordId);
+                invPlaceOrderDetailEntity.setBatchNo(filterInvPlaceOrderRequest.getBatchNo());
+                invPlaceOrderDetailEntity.setCode(filterInvPlaceOrderRequest.getCode());
+                invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId()+"");
+                invPlaceOrderDetailEntity.setNameCode(filterInvPlaceOrderRequest.getNameCode());
+                invPlaceOrderDetailEntity.setExpireDate(filterInvPlaceOrderRequest.getExpireDate());
+                invPlaceOrderDetailEntity.setProduceDate(filterInvPlaceOrderRequest.getProduceDate());
+                invPlaceOrderDetailEntity.setSupId(filterInvPlaceOrderRequest.getSupId());
+                invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
+                invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+                invPlaceOrderDetailEntity.setSerialNo(filterInvPlaceOrderRequest.getSerialNo());
+                invPlaceOrderDetailEntity.setCount(filterInvPlaceOrderRequest.getCount());
+                invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity);
+            }
+        } else {
+            //插入附表
+            for (FilterInvPlaceOrderRequest filterInvPlaceOrderRequest : filterInvPlaceOrderRequestList) {
+                InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
+                invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
+                invPlaceOrderDetailEntity.setRecordId(recordId);
+                invPlaceOrderDetailEntity.setCode(filterInvPlaceOrderRequest.getCode());
+                invPlaceOrderDetailEntity.setBatchNo(filterInvPlaceOrderRequest.getBatchNo());
+                invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId()+"");
+                invPlaceOrderDetailEntity.setNameCode(filterInvPlaceOrderRequest.getNameCode());
+                invPlaceOrderDetailEntity.setExpireDate(filterInvPlaceOrderRequest.getExpireDate());
+                invPlaceOrderDetailEntity.setProduceDate(filterInvPlaceOrderRequest.getProduceDate());
+                invPlaceOrderDetailEntity.setSupId(filterInvPlaceOrderRequest.getSupId());
+                invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
+                invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+                invPlaceOrderDetailEntity.setSerialNo(filterInvPlaceOrderRequest.getSerialNo());
+                invPlaceOrderDetailEntity.setCount(filterInvPlaceOrderRequest.getCount());
+                invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity);
+            }
+        }
+
+
+        return ResultVOUtils.success(recordId);
+    }
+
     @Override
     public List<InvPlaceOrderDetailResponse> filterInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
         if (null == filterInvPlaceOrderRequest) {

src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java

@@ -83,7 +83,6 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 //        String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
         InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
         List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList=new ArrayList<>();
-
         if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
             invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId",bindInvSpaceRequest.getOrderId()));
             for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
@@ -91,11 +90,20 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
                     //拆解库存表
                     QueryWrapper<InvPreInProductDetailEntity> ew=new QueryWrapper<>();
-                    ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                    InvPreInProductDetailEntity invPreInProductDetailEntity=new InvPreInProductDetailEntity();
-                    ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode",""));
+                    if(bindInvSpaceRequest.getType()==3){
-                    ew.gt("inCount",0);
+                        ew.eq("code",invPlaceOrderDetailEntity.getCode());
-                    ew.last("limit 1");
+                        ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
-                    InvPreInProductDetailEntity invPreInProductDetailEntity=invPreInProductDetailDao.selectOne(ew);
+                        ew.last("limit 1");
+                        invPreInProductDetailEntity=invPreInProductDetailDao.selectOne(ew);
+                    }else{
+                        ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                        ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode",""));
+                        ew.gt("inCount",0);
+                        ew.last("limit 1");
+                        invPreInProductDetailEntity=invPreInProductDetailDao.selectOne(ew);
+                    }
+
 
                     if(invPreInProductDetailEntity.getInCount()>0){
                         String nameCode=invPreInProductDetailEntity.getNameCode();
@@ -108,7 +116,12 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
                         ew.clear();
                         ew.eq("code",invPlaceOrderDetailEntity.getCode());
-                        ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode());
+                        if(bindInvSpaceRequest.getType()==3){
+                            ew.eq("invSpaceCode",bindInvSpaceRequest.getChangeSpaceCode());
+                        }else{
+                            ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode());
+                        }
+
 
                         InvPreInProductDetailEntity invPreInProductDetailEntity1=invPreInProductDetailDao.selectOne(ew);
                         if(invPreInProductDetailEntity1!=null){
@@ -122,7 +135,11 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                             invPreInProductDetailEntity.setCount(1);
                             invPreInProductDetailEntity.setReCount(reCount);
                             invPreInProductDetailEntity.setOutCount(0);
-                            invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
+                           if (bindInvSpaceRequest.getType()==3){
+                               invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
+                           }else{
+                               invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
+                           }
                             invPreInProductDetailDao.insert(invPreInProductDetailEntity);
                         }
                     }
@@ -260,6 +277,51 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         return ResultVOUtils.success();
     }
 
+
+    @Override
+    public BaseResponse bindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) {
+        //查询仓库的部门ID
+//        String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
+        List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList=new ArrayList<>();
+
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId",bindInvSpaceRequest.getOrderId()));
+            QueryWrapper<InvPreInProductDetailEntity> ew=new QueryWrapper<>();
+            ew.eq("orderId",bindInvSpaceRequest.getOId());
+            InvPreInProductDetailEntity invPreInProductDetailEntity=new InvPreInProductDetailEntity();
+            invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invPreInProductDetailDao.update(invPreInProductDetailEntity,ew);
+
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+
+            invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId",bindInvSpaceRequest.getOrderId()));
+            QueryWrapper<InvPreProductDetailEntity> ew=new QueryWrapper<>();
+            ew.eq("orderId",bindInvSpaceRequest.getOId());
+            InvPreProductDetailEntity invPreProductDetailEntity=new InvPreProductDetailEntity();
+            invPreProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invPreProductDetailDao.update(invPreProductDetailEntity,ew);
+
+
+        } else {
+            invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId",bindInvSpaceRequest.getOrderId()));
+            QueryWrapper<InvProductDetailEntity> ew=new QueryWrapper<>();
+            ew.eq("orderId",bindInvSpaceRequest.getOId());
+            InvProductDetailEntity invProductDetailEntity=new InvProductDetailEntity();
+            invProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invProductDetailDao.update(invProductDetailEntity,ew);
+
+        }
+        int total = invPlaceOrderDetailEntityList.stream().mapToInt(InvPlaceOrderDetailEntity::getCount).sum();
+        QueryWrapper<InvPlaceOrderEntity> ew=new QueryWrapper<>();
+        ew.eq("recordId",bindInvSpaceRequest.getOrderId());
+        InvPlaceOrderEntity invPlaceOrderEntity=new InvPlaceOrderEntity();
+        invPlaceOrderEntity.setRecordId(bindInvSpaceRequest.getOrderId());
+        invPlaceOrderEntity.setCount(total);
+        invPlaceOrderDao.update(invPlaceOrderEntity,ew);
+        return ResultVOUtils.success();
+    }
+
     @Override
     public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
         //查询仓库的部门ID
@@ -387,8 +449,17 @@ public class InvPlaceServiceImpl implements InvPlaceService {
     @Override
     public String checkCount(BindInvSpaceRequest bindInvSpaceRequest) {
         InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", bindInvSpaceRequest.getInvCode()));
+        Integer count=0;
         if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
-            Integer count  = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                QueryWrapper<InvPreInProductDetailEntity> ew=new QueryWrapper<>();
+                ew.eq("code",bindInvSpaceRequest.getCode());
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+                InvPreInProductDetailEntity invPreInProductDetailEntity=invPreInProductDetailDao.selectOne(ew);
+                count=invPreInProductDetailEntity.getInCount();
+            }else{
+                count  = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            }
             if(count==null || count<=0){
                 return "该产品库存不足！";
             }
@@ -397,12 +468,25 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 ew.eq("recordId",bindInvSpaceRequest.getOrderId());
                 ew.eq("code",bindInvSpaceRequest.getCode());
                 InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew);
+                if(invPlaceOrderDetailEntity==null){
+                    invPlaceOrderDetailEntity=new InvPlaceOrderDetailEntity();
+                    invPlaceOrderDetailEntity.setCount(0);
+                }
                 if(invPlaceOrderDetailEntity.getCount()>=count){
                     return "该产品库存不足！";
                 }
             }
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
-            Integer count  = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                QueryWrapper<InvPreProductDetailEntity> ew=new QueryWrapper<>();
+                ew.eq("code",bindInvSpaceRequest.getCode());
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+                InvPreProductDetailEntity invPreProductDetailEntity=invPreProductDetailDao.selectOne(ew);
+                count=invPreProductDetailEntity.getInCount();
+            }else{
+                count  = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            }
+
             if(count==null || count<=0){
                 return "该产品库存不足！";
             }
@@ -411,12 +495,25 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 ew.eq("recordId",bindInvSpaceRequest.getOrderId());
                 ew.eq("code",bindInvSpaceRequest.getCode());
                 InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew);
+                if(invPlaceOrderDetailEntity==null){
+                    invPlaceOrderDetailEntity=new InvPlaceOrderDetailEntity();
+                    invPlaceOrderDetailEntity.setCount(0);
+                }
                 if(invPlaceOrderDetailEntity.getCount()>=count){
                     return "该产品库存不足！";
                 }
             }
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL){
-            Integer count  = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            if(bindInvSpaceRequest.getType()==3){
+                QueryWrapper<InvProductDetailEntity> ew=new QueryWrapper<>();
+                ew.eq("code",bindInvSpaceRequest.getCode());
+                ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+                InvProductDetailEntity invProductDetailEntity=invProductDetailDao.selectOne(ew);
+                count=invProductDetailEntity.getInCount();
+            }else{
+                count  = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+            }
+
             if(count==null || count<=0){
                 return "该产品库存不足！";
             }
@@ -425,6 +522,10 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 ew.eq("recordId",bindInvSpaceRequest.getOrderId());
                 ew.eq("code",bindInvSpaceRequest.getCode());
                 InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew);
+                if(invPlaceOrderDetailEntity==null){
+                    invPlaceOrderDetailEntity=new InvPlaceOrderDetailEntity();
+                    invPlaceOrderDetailEntity.setCount(0);
+                }
                 if(invPlaceOrderDetailEntity.getCount()>=count){
                     return "该产品库存不足！";
                 }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -150,11 +150,11 @@
         (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
         (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
         (select name from basic_corp bc where bc.erpId = io.customerId)          customerName,
-        (SELECT count(*) FROM io_order_detail_biz  WHERE io_order_detail_biz.orderIdFk = io.billNo
+        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
-        and io_order_detail_biz.regStatus = 1
+        and io_order_detail_code.regStatus = 1
         ) AS allCout,
-        (SELECT count(*) FROM io_order_detail_biz  WHERE io_order_detail_biz.orderIdFk = io.billNo
+        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
-        and io_order_detail_biz.regStatus = 0
+        and io_order_detail_code.regStatus = 0
         ) As partCount
         from io_order as io
         <where>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -24,11 +24,13 @@
     </select>
 
 
-    <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
+    <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
-        select io_order_detail_biz.*,
+        select io_order_detail_code.*,
-        (select count(*) FROM io_order_invoice where io_order_invoice.orderIdFk=io_order_detail_biz.orderIdFk) as sucCount
+        (select count(*)
-        from io_order_detail_biz
+        FROM io_order_invoice
-        left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+        where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
+        from io_order_detail_code
+        left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
         left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
@@ -44,7 +46,7 @@
                 AND bp.cpmctymc like concat('%', #{productName}, '%')
             </if>
         </where>
-        group by io_order_detail_biz.id
+        group by io_order_detail_code.id
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">

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

@@ -397,4 +397,5 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
 
-CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1);
+-- CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);