单据流程相关修改

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

@@ -10,6 +10,7 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicCorpEntity;
@@ -29,6 +30,7 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.res.inout.AddCodeResult;
+import com.glxp.api.service.auth.DeptService;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.*;
@@ -88,6 +90,8 @@ public class IoCodeTempController extends BaseController {
     InvPreinDetailService invPreinDetailService;
     @Resource
     InvProductDetailService invProductDetailService;
+    @Resource
+    DeptService deptService;
 
     //手持端扫码单据上传调用接口
     @AuthRuleAnnotation("")
@@ -572,6 +576,10 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
                 orderEntity.setAction(bussinessTypeEntity.getAction());
                 orderEntity.setFromCorp(addOrderRequest.getFromCorp());
+                if (StrUtil.isNotEmpty(addOrderRequest.getFromInvCode())) {
+                    InvWarehouseEntity invWarehouseEntity1 = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode());
+                    orderEntity.setFromDeptCode(invWarehouseEntity1.getParentId());
+                }
                 orderEntity.setFromInvCode(addOrderRequest.getFromInvCode());
                 orderEntity.setFromType(ConstantStatus.FROM_WEBNEW);
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);

src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java

@@ -12,6 +12,7 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.*;
 import com.glxp.api.http.HttpOkClient;
+import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.*;
 import com.glxp.api.res.PageSimpleResponse;
@@ -353,6 +354,7 @@ public class ThrOrderController {
         }
         return ResultVOUtils.error(500, "上传数据成功");
     }
+
     //只查询第三方单据
     @GetMapping("/udiwms/thirdOrder/filter")
     public BaseResponse filterThirdOrder(FilterThrOrderRequest filterErpOrderRequest,
@@ -419,5 +421,50 @@ public class ThrOrderController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/spms/erpOrder/filter")
+    public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
+                                        BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+        BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
+        filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
+        filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
+
+        List<ThrOrderResponse> erpOrderResponses = new ArrayList<>();
+        List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
+        if (data != null && data.size() > 0) {
+            for (ThrOrderEntity thrOrderEntity : data) {
+                FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
+                filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
+                List<ThrOrderDetailEntity> thrOrderDetailEntities =
+                        thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
+                ThrOrderResponse erpOrderResponse = new ThrOrderResponse();
+                BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse);
+                List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
+                if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
+                    for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
+                        ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder();
+                        BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
+                        subErpOrder.setCount(thrOrderDetailEntity.getCount());
+                        subErpOrder.setReCount(thrOrderDetailEntity.getReCount());
+                        subErpOrders.add(subErpOrder);
+                    }
+                }
+                erpOrderResponse.setSubErpOrders(subErpOrders);
+                erpOrderResponses.add(erpOrderResponse);
+            }
+        }
+        PageInfo<ThrOrderEntity> pageInfo;
+        pageInfo = new PageInfo<>(data);
+        PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(erpOrderResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
 }

src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 作者
@@ -19,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @TableName("thr_order_detail")
-public class ThrOrderDetailEntity{
+public class ThrOrderDetailEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -43,10 +43,10 @@ public class ThrOrderDetailEntity{
     private String productDate;
 
     @TableField("count")
-    private String count;
+    private Integer count;
 
     @TableField("reCount")
-    private String reCount;
+    private Integer reCount;
 
     @TableField("orderIdFk")
     private String orderIdFk;

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

@@ -308,8 +308,8 @@ public class IoAddInoutService {
         orderService.update(order);
         codeTempService.insertBatch(supplementCodes);
         dealProcess(supplementOrder);
-        if (!ioCheckInoutService.checkManual(order.getBillNo())) {
+        if (!ioCheckInoutService.checkManual(supplementOrder.getBillNo())) {
-            ioCheckInoutService.check(order.getBillNo());
+            ioCheckInoutService.check(supplementOrder.getBillNo());
         }
         return ResultVOUtils.success();
     }

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

@@ -172,7 +172,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 break;
             case Constant.ORDER_STATUS_PROCESSED_ERROR:
                 filterOrderRequest.setStatuses(Arrays.asList(4));
-                filterOrderRequest.setDealStatuses(Arrays.asList(2));
+                filterOrderRequest.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
                 break;
             case Constant.ORDER_STATUS_NEW_ORDER:
                 filterOrderRequest.setStatuses(Arrays.asList(1, 2, 3, 4, 6));

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_ww?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: pro
+    active: dev
   jmx:
     enabled: true