Merge branch 'busUser' into wms_pzh

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java

@@ -32,7 +32,9 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest;
 import com.glxp.api.admin.req.business.StockOrderPostRequest;
 import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
-import com.glxp.api.admin.req.inventory.*;
+import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
+import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest;
+import com.glxp.api.admin.req.inventory.PostStockPrintRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.res.business.StockOrderExportResponse;
@@ -48,7 +50,6 @@ import com.glxp.api.admin.service.business.StockOrderDetailService;
 import com.glxp.api.admin.service.business.StockOrderDetailTempService;
 import com.glxp.api.admin.service.business.StockOrderService;
 import com.glxp.api.admin.service.business.StockQRCodeTextService;
-import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.CodesService;
 import com.glxp.api.admin.service.inout.CodesTempService;
@@ -329,6 +330,7 @@ public class StockOrderController {
         //查询仓库名称
         orderService.queryInvName(resultList);
         resultList = orderService.checkSubmitOrder(resultList);
+        orderService.setUploadFlag(resultList);
         PageSimpleResponse<StockOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(resultList);

api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java

@@ -38,4 +38,6 @@ public interface UnitMaintainPlatformDao{
     UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId);
 
     void deleteById(String id);
+
+    Long selectCount(@Param("action") String action);
 }

api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java

@@ -21,4 +21,7 @@ public class StockOrderResponse extends StockOrderEntity {
     //当前分库名称
     private String invWarehouseName;
 
+    //单据是否可以上传
+    private boolean uploadFlag;
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java

@@ -136,4 +136,12 @@ public interface OrderService {
      * @param responseList
      */
     void queryInvName(List<StockOrderResponse> responseList);
+
+    /**
+     *
+     * 设置单据上传状态
+     * @param resultList
+     */
+    void setUploadFlag(List<StockOrderResponse> resultList);
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -13,10 +13,7 @@ import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao;
 import com.glxp.api.admin.dao.basic.BussinessTypeDao;
 import com.glxp.api.admin.dao.business.StockOrderDao;
 import com.glxp.api.admin.dao.business.StockOrderDetailDao;
-import com.glxp.api.admin.dao.inout.CodesDao;
-import com.glxp.api.admin.dao.inout.CodesTempDao;
-import com.glxp.api.admin.dao.inout.OrderDao;
-import com.glxp.api.admin.dao.inout.OrderDetailDao;
+import com.glxp.api.admin.dao.inout.*;
 import com.glxp.api.admin.dao.inventory.*;
 import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
 import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
@@ -90,6 +87,8 @@ public class OrderServiceImpl implements OrderService {
     private InvPreInProductDao invPreInProductDao;
     @Resource
     private InvPreInProductDetailDao invPreInProductDetailDao;
+    @Resource
+    private UnitMaintainPlatformDao unitMaintainPlatformDao;
 
     @Override
     public List<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) {
@@ -502,6 +501,15 @@ public class OrderServiceImpl implements OrderService {
         }
     }
 
+    @Override
+    public void setUploadFlag(List<StockOrderResponse> resultList) {
+        for (StockOrderResponse stockOrderResponse : resultList) {
+            Long count = unitMaintainPlatformDao.selectCount(stockOrderResponse.getBillType());
+            stockOrderResponse.setUploadFlag(count > 0 ? true : false);
+        }
+
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void deleteOrders(List<String> ids) {

api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml

@@ -130,4 +130,10 @@
     <delete id="deleteById">
         delete from io_unit_maintain_platform where id = #{id}
     </delete>
+
+    <select id="selectCount" resultType="java.lang.Long">
+        select count(*)
+        from io_unit_maintain_platform
+        where sourceAction = #{action}
+    </select>
 </mapper>