bug修改

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -427,6 +427,7 @@ public class OrderDetailController {
     @PostMapping("/warehouse/selectErpOrder")
     public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) {
 
+
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -457,14 +458,20 @@ public class OrderDetailController {
                     erpOrderEntity.setInvWarehouseCode(purchaseinResponse.getInvWarehouseCode());
                     erpOrderEntity.setLocStorageCode(purchaseinResponse.getLocStorageCode());
                     erpOrderEntity.setGoodsunit(subPurchase.getSpec());
+                    erpOrderEntity.setBillType(purchaseinResponse.getBillType());
                     erpOrderEntity.setBindRlFk(subPurchase.getRelId());
                     erpOrderEntities.add(erpOrderEntity);
                 }
             }
         }
         if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
-
             AuthAdmin authAdmin = customerService.getUserBean();
+            OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+            orderFilterRequest.setId(importErpOrderRequest.getOrderId());
+            OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
+            orderEntity.setReviewUser(authAdmin.getId().intValue());
+            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
+
             ErpOrderEntity temp = erpOrderEntities.get(0);
             for (int i = 0; i < erpOrderEntities.size(); i++) {
                 if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) {
@@ -479,15 +486,15 @@ public class OrderDetailController {
                 if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
                     return ResultVOUtils.error(500, "所选业务单据当前分库不一致！");
                 }
-            }
 
-            OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
-            orderFilterRequest.setId(importErpOrderRequest.getOrderId());
-            OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
-            long customerId = customerService.getCustomerId();
-            if (customerId == 110) {
-                orderEntity.setReviewUser(authAdmin.getId().intValue());
+                if (!bussinessTypeEntity.getLocalAction().equals(erpOrderEntities.get(i).getBillType())) {
+                    return ResultVOUtils.error(500, "所选单据类型不一致！");
+                }
+
+
             }
+
+
             ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId());
             if (exitErp != null) {
                 String errMsg = "所选业务单据" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定";

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java

@@ -35,6 +35,7 @@ import com.glxp.sale.admin.service.param.SystemPDFTemplateService;
 import com.glxp.sale.admin.thread.JaspaperService;
 import com.glxp.sale.admin.util.Constant;
 import com.glxp.sale.admin.util.CustomUtil;
+import com.glxp.sale.admin.util.FileUtils;
 import com.glxp.sale.admin.util.JasperUtils;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -50,6 +51,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -169,8 +171,10 @@ public class StockQRCodeTextController {
             }
         }
 
-
         if (printEntities.size() > 1000) {  //如果标签打印数据大于1000，则切割生成多个文件
+            if (!FileUtils.isFileExist(dirPath + "/pdfprint")) {
+                new File(dirPath + "/pdfprint").mkdirs();
+            }
             List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
             int index = 0;
             List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();
@@ -179,6 +183,8 @@ public class StockQRCodeTextController {
                 StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
                 if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
                     String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
+
+
                     String filePath = dirPath + "\\pdfprint\\" + fileName;
                     stockPrintTempEntity.setFileName(fileName);
                     stockPrintTempEntity.setFilePath(filePath);
@@ -258,7 +264,9 @@ public class StockQRCodeTextController {
                 printEntities.add(stockPrintEntity);
             }
         }
-
+        if (!FileUtils.isFileExist(dirPath + "/pdfprint")) {
+            new File(dirPath + "/pdfprint").mkdirs();
+        }
         List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
         int index = 0;
         List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java

@@ -44,7 +44,7 @@ public class ErpOrderEntity {
     private String supId;
     private String supName;
     private Integer bindSupStatus;
-
+    private String billType;
 
     private String nameCode;
     private String productCompany;

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -37,5 +37,6 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private Integer unionUser;
     private String entrustUser;
     private boolean entrustEnd;
+    private String localAction;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java

@@ -122,7 +122,7 @@ public class JasperUtils {
             InputStream is = new ByteArrayInputStream(JSON.toJSONString(data).getBytes("UTF-8"));
             map.put("JSON_INPUT_STREAM", is); //填充报表数据
             map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH);
-//		    ClassPathResource resource = new ClassPathResource(jasperResource);
+
             FileInputStream jasperStream = new FileInputStream(new File(jasperResource));
 //			InputStream jasperStream = resource.getInputStream();
 

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

@@ -151,7 +151,9 @@
             <if test="unitIdFk != '' and unitIdFk!=null">
                 and unitIdFk = #{unitIdFk}
             </if>
-
+            <if test="localAction != '' and localAction!=null">
+                and billType = #{localAction}
+            </if>
             <if test="userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
                 invWarehouseCode is null or invWarehouseCode='')