diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
index bf66a92..2e0ecfb 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
@@ -182,12 +182,17 @@ class MaterialLabelServiceImpl implements MaterialLabelService {
         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
     @Transactional(rollbackFor = Exception.class)
     public JSONObject print(JSONObject jsonMst) {
         String now = DateUtil.now();
         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";
         if (StrUtil.isEmpty(jsonMst.optString("dtl_count"))) {
             order_seq = NumberUtil.add(order_seq, "1").toString();
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/wql/md.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/wql/md.xls
index a3f374b..fedd92d 100644
Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/wql/md.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/wql/md.xls differ
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
index 8baca23..94c7094 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
@@ -134,7 +134,6 @@ public class OutTask extends AbstractAcsTask {
             //刪除庫存
             WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+startPoint.getString("point_uuid")+"'");
 
-
         }
         WQLObject.getWQLObject("sch_base_task").update(taskjo);
     }