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

代码更新

Browse Source
This commit is contained in:
ludj
2022-11-11 13:35:29 +08:00
parent ab4dba0683
commit 7661c84ace
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
View File

@@ -182,12 +182,17 @@ class MaterialLabelServiceImpl implements MaterialLabelService {
WQLObject.getWQLObject("md_base_materialLabelMst").update(jsonObject); WQLObject.getWQLObject("md_base_materialLabelMst").update(jsonObject);
} }
public static void main(String[] args) {
String nowDate = DateUtil.format(new Date(), "yyMMddHHmm");
System.out.println(nowDate);
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public JSONObject print(JSONObject jsonMst) { public JSONObject print(JSONObject jsonMst) {
String now = DateUtil.now(); String now = DateUtil.now();
String nowDate = DateUtil.format(new Date(), "yyMMddHHmm"); String nowDate = DateUtil.format(new Date(), "yyMMddHHmm");
String label_code = jsonMst.optString("material_code") + jsonMst.optString("customer") + jsonMst.optString("material_spce") + jsonMst.optString("machine") + nowDate + jsonMst.optString("pcsn") + jsonMst.optString("formula"); String label_code = jsonMst.optString("customer")+jsonMst.optString("formula") + nowDate + jsonMst.optString("pcsn") + jsonMst.optString("weight");
String order_seq = "0"; String order_seq = "0";
if (StrUtil.isEmpty(jsonMst.optString("dtl_count"))) { if (StrUtil.isEmpty(jsonMst.optString("dtl_count"))) {
order_seq = NumberUtil.add(order_seq, "1").toString(); order_seq = NumberUtil.add(order_seq, "1").toString();

BIN
wms/hd/nladmin-system/src/main/java/org/nl/wms/md/wql/md.xls
View File

Binary file not shown.

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -134,7 +134,6 @@ public class OutTask extends AbstractAcsTask {
//刪除庫存 //刪除庫存
WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+startPoint.getString("point_uuid")+"'"); WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+startPoint.getString("point_uuid")+"'");
} }
WQLObject.getWQLObject("sch_base_task").update(taskjo); WQLObject.getWQLObject("sch_base_task").update(taskjo);
} }