root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-25 10:05:58 +08:00
parent c867b933fd c96b5d7301
commit 2ed0a9f7b7
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
View File

@@ -44,6 +44,7 @@ public class PrintServiceImpl implements PrintService {
@Override @Override
public JSONObject customerPrint(JSONObject whereJson) { public JSONObject customerPrint(JSONObject whereJson) {
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
WQLObject printTab = WQLObject.getWQLObject("pdm_bi_printinfo");
String box_no = whereJson.getString("box_no"); String box_no = whereJson.getString("box_no");
@@ -90,7 +91,9 @@ public class PrintServiceImpl implements PrintService {
} }
// 生成txt文件 // 生成txt文件
String filePath = "//10.1.3.21" + "/LMSPrinter/" + "外包标签.txt"; JSONObject jsonPrint = printTab.query("print_id = '" + whereJson.getString("print_id") + "'").uniqueResult(0);
//10.1.3.21/LMSPrinter/
String filePath = jsonPrint.getString("print_route")+ "外包标签.txt";
FileWriter fw = null; FileWriter fw = null;
try { try {
File file = new File(filePath); File file = new File(filePath);

17
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -2169,7 +2169,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数 int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数
if (shd_dtl_num > dtlArr.size()) { if (shd_dtl_num > dtlArr.size()) {
ArrayList<HashMap<String, Object>> flData = new ArrayList<>(); ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
WriteSheet sheet = EasyExcel.writerSheet().build(); WriteSheet sheet = EasyExcel.writerSheet().build();
@@ -2193,14 +2192,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
double ceil = Math.ceil(div); double ceil = Math.ceil(div);
Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0)));
HashMap<String, Object> mapFL = new HashMap<>();
ArrayList<HashMap<String, Object>> flData = new ArrayList<>(); ArrayList<HashMap<String, Object>> flData = new ArrayList<>();
for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) { for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) {
if (i == dtlArr.size()) { if (i == dtlArr.size()) {
break; break;
} }
JSONObject json = dtlArr.getJSONObject(i); JSONObject json = dtlArr.getJSONObject(i);
HashMap<String, Object> mapFL = new HashMap<>();
mapFL.put("index", i + 1); mapFL.put("index", i + 1);
mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("source_bill_code", json.getString("source_bill_code"));
mapFL.put("material_name", json.getString("material_name")); mapFL.put("material_name", json.getString("material_name"));
@@ -2210,22 +2208,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
flData.add(mapFL); flData.add(mapFL);
} }
WriteSheet sheet = EasyExcel.writerSheet(0).build(); WriteSheet sheet = EasyExcel.writerSheet(0).build();
workBook.fill(oneMap, sheet); workBook.fill(oneMap, sheet);
workBook.fill(new FillWrapper("data", flData), sheet); workBook.fill(new FillWrapper("data", flData), sheet);
workBook.finish();
} }
workBook.finish();
// workBook.fill(oneMap, sheet);
// workBook.fill(ylData, sheet);
}
public static void main(String[] args) {
double ceil = Math.ceil(2.2);
Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0)));
System.out.println(integer);
} }
/** /**