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

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

@@ -15,10 +15,7 @@ import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
-import com.glxp.api.req.basic.FilterUdiRelRequest;
-import com.glxp.api.req.basic.LockUdiRequest;
-import com.glxp.api.req.basic.UdiCombineRequest;
-import com.glxp.api.req.basic.UdiRelevanceSaveRequest;
+import com.glxp.api.req.basic.*;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -68,6 +65,8 @@ public class UdiRelevanceController extends BaseController {
     ThrDataService thrDataService;
     @Resource
     UdiRlSupService udiRlSupService;
+    @Resource
+    ProductInfoService productInfoService;
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -704,5 +703,17 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(ggxhList);
     }
 
+    //国家库uuid获取产品
+    @PostMapping("/udi/udirel/selectOriginuuid")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
+    public BaseResponse selectOriginuuid(@RequestBody ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ProductInfoEntity> udiProductEntities = productInfoService.findAll(productInfoFilterRequest);
+        return ResultVOUtils.success(udiProductEntities);
+    }
+
 
 }

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

@@ -138,12 +138,15 @@ public class IoOrderController extends BaseController {
         }
         List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
         for (IoOrderResponse ioOrderResponse : list) {
+            if(ioOrderResponse.getCheckStatus() == null){
+                ioOrderResponse.setCheckStatus(0+"");
+            }
             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) {
+                if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null ) {
                     amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
                 }
             }

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

@@ -642,7 +642,9 @@ public class IoOrderDetailBizController extends BaseController {
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
         List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
         for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-            ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+            if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null ) {
+                ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+            }
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
             ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -376,7 +376,8 @@
                auth_warehouse.name,
                auth_warehouse.parentId,
                auth_warehouse.parentCode,
-               auth_dept.name warehouseName
+               auth_dept.name warehouseName,
+               auth_warehouse.advanceType
         from auth_warehouse
                      inner join auth_dept on auth_warehouse.parentId = auth_dept.code
                      LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code