销售订单定时拉取

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -23,6 +23,8 @@ import com.google.gson.GsonBuilder;
 //import org.apache.shiro.SecurityUtils;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -742,6 +744,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  sbu.append(disSplit[1]);
 					  syPreList.get(index).setDistributionPointSlash(sbu.toString());
 				  }
+
+				  //配码规格
+				  String splitpeima[] = syPreList.get(index).getCodingRules().split(",");
 				  //}
 				  workbook.setSheetName(index,syPreList.get(index).getSupplier()+"-"+syPreList.get(index).getDistributionPointSlash()+"-"+(index+1));
 				  StringBuilder builder = new StringBuilder();
@@ -783,6 +788,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  String sunBox = "";
 				  String pcspack = "";//件数/每包
 
+
 				  Row row1 = sheet.createRow(0);
 				  Row row2 = sheet.createRow(1);
 
@@ -872,8 +878,27 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellFormula("SUM("+params2[8]+"2:"+params2[size]+"2)/"+pcspack+"2*SUM(F2-E2+1)");
 					  }
+
+
 				  }
 				  index++;
+
+				  CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 1, params.length-13, params.length-13);
+				  DataValidationHelper helper = sheet.getDataValidationHelper();
+
+				  DataValidationConstraint constraint = helper.createExplicitListConstraint(splitpeima);
+				  DataValidation dataValidation = helper.createValidation(constraint, cellRangeAddressList);
+				  //处理Excel兼容性问题
+				  if (dataValidation instanceof XSSFDataValidation) {
+					  dataValidation.setSuppressDropDownArrow(true);
+					  dataValidation.setShowErrorBox(true);
+				  } else {
+					  dataValidation.setSuppressDropDownArrow(false);
+				  }
+				  dataValidation.setEmptyCellAllowed(true);
+				  dataValidation.setShowPromptBox(true);
+				  dataValidation.createPromptBox("提示", "只能选择下拉框里面的数据");
+				  sheet.addValidationData(dataValidation);
 			  }
 			  req.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 			  req.setCharacterEncoding("utf-8");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -137,9 +137,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
 			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
 		}
-//		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
-//			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
-//		}
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getTimeStuta())){
+			queryWrapper.eq("a.time_stuta",syShippingOrder.getTimeStuta());
+		}
 		if(oConvertUtils.isNotEmpty(type)){
 			if(type.equals("成衣")){
 				queryWrapper.eq("b.ready_fabric","成衣");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -127,7 +127,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
                         " left join Vendor v on s.cDefine12=v.cVenName" +
-                        " where s.iStatus = 1  AND (s.cdefine15 is null or  s.cdefine15 !='1' and s.cdefine15 !='2')  ";
+                        " where s.iStatus = 1 and (s.cCloser is null or s.cCloser='asuser') AND (s.cdefine15 is null or  s.cdefine15 !='1' and s.cdefine15 !='2') ";
 
                 if(this.parameter==null || this.parameter.equals("") || this.parameter.equals(" ")){
                     sql=sql+" order by s.dDate desc ";
@@ -274,14 +274,16 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                 QueryWrapper<SyOrderDataItem> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("sy_order_data_id",sy.getAccount()+orderID);
                 List<SyOrderDataItem> entityList = syOrderDataItemService.list(queryWrapper1);
-                for(SyOrderDataItem str:entityList){
-                    deleteId.add(str.getId());
-                }
-                //比对两个几个的差集，删除deleteId集合不存的ID
-                Collection subtract = CollectionUtils.subtract(deleteId, idsID);
-                for (Object s:subtract) {
-                    //删除没用的数据
-                    syOrderDataItemService.deleteByID(s.toString());
+                if(entityList.size()!=0) {
+                    for (SyOrderDataItem str : entityList) {
+                        deleteId.add(str.getId());
+                    }
+                    //比对两个几个的差集，删除deleteId集合不存的ID
+                    Collection subtract = CollectionUtils.subtract(deleteId, idsID);
+                    for (Object s : subtract) {
+                        //删除没用的数据
+                        syOrderDataItemService.deleteByID(s.toString());
+                    }
                 }
 
                 //添加单证id 原数据账套+原数据id