物资拜放bug修复

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

@@ -25,7 +25,6 @@ public class InvPlaceOrderController {
     public BaseResponse filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
         List<InvPlaceOrderResponse> list = invPlaceOrderService.filterList(filterInvPlaceOrderRequest);
         PageInfo<InvPlaceOrderResponse> pageInfo = new PageInfo<>(list);
-        System.out.println("6666666666666666");
         return ResultVOUtils.page(pageInfo);
     }
 

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

@@ -70,6 +70,13 @@ public class InvPlaceOrderDetailEntity {
     @TableField(value = "serialNo")
     private String serialNo;
 
+    @TableField(value = "topInvCode")
+    private String topInvCode;
+
+    @TableField(value = "topInvSpaceCode")
+    private String topInvSpaceCode;
+
+
 
 
 }

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

@@ -94,4 +94,10 @@ public class InvPlaceOrderDetailResponse {
 
     private String recordId;
 
+    private String topInvCode;
+
+    private String topInvSpaceCode;
+
+    private String topInvSpaceName;
+
 }

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

@@ -132,5 +132,7 @@ public class InvPlaceOrderResponse {
     private String manufactory;
 
     private Integer count;
+    
+    private String topInvSpaceName;
 
 }

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

@@ -10,8 +10,10 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.dao.auth.InvSpaceDao;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.inv.*;
+import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.inv.*;
 import com.glxp.api.req.inv.AddInvPlaceOrderRequest;
@@ -60,6 +62,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
     private InvPreProductDetailDao invPreProductDetailDao;
     @Resource
     private InvPreInProductDetailDao invPreInProductDetailDao;
+    @Resource
+    private InvSpaceDao invSpaceDao;
 
 
     @Override
@@ -129,6 +133,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         String produceDate = null;
         String expireDate = null;
         String serialNo = null;
+        InvSpace invSpace=invSpaceDao.selectOne(new QueryWrapper<InvSpace>().eq("code", bindInvSpaceRequest.getInvSpaceCode()));
         InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", bindInvSpaceRequest.getInvCode()));
         if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
             QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
@@ -189,7 +194,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
             InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
             orderEntity.setId(IdUtil.getSnowflakeNextId());
             orderEntity.setRecordId(recordId);
-            orderEntity.setType(3);
+            orderEntity.setType(bindInvSpaceRequest.getType());
 //            orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId());
             orderEntity.setCreateUser(userId);
             orderEntity.setCreateTime(new Date());
@@ -202,6 +207,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
             invPlaceOrderDetailEntity.setRecordId(recordId);
             invPlaceOrderDetailEntity.setBatchNo(batchNo);
             invPlaceOrderDetailEntity.setRelId(relId + "");
+            invPlaceOrderDetailEntity.setTopInvCode(invSpace.getInvWarehouseCode());
+            invPlaceOrderDetailEntity.setTopInvSpaceCode(invSpace.getCode());
             invPlaceOrderDetailEntity.setNameCode(nameCode);
             invPlaceOrderDetailEntity.setExpireDate(expireDate);
             invPlaceOrderDetailEntity.setProduceDate(produceDate);

src/main/resources/mybatis/mapper/inv/InvPlaceOrderDao.xml

@@ -12,6 +12,7 @@
                (select employeeName from auth_user where id = t.createUser) operatorName,
                (select name from auth_warehouse where code = t2.invCode)    invName,
                (select name from auth_space where code = t2.invSpaceCode)   invSpaceName,
+               (select name from auth_space where code = t2.topInvSpaceCode)   topInvSpaceName,
                t.createTime,
                t2.code,
                t2.batchNo,