diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index a89d9a3..06c2687 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -346,10 +346,6 @@ public class ZyjhController {
                 }
 
                 for (DmYdjh item : list) {
-                    //生成预配盘信息
-//                    DmYppyz dmYppyz = DmYppyz.of(item);
-//                    dmYppyz.insert();
-
                     //生成零件信息
                     List<DmYdjhLj> ljList = zyjhService.createLj(item.getDcCh(), item.getDcPl(), item.getTzbh());
 
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index e89ccfd..54fbe53 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -154,14 +154,17 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
                         .forEach(file -> {
                             if (file.exists()){
                                 List<String> strings = ExcelUtil.ReadExcelByLine(file);
-                                System.out.println(strings);
                                 for (DmYdjhLj _lj : values){
                                     for (String _str:strings){
                                         if (_str.contains(_lj.getTlth())&&_str.contains(_lj.getLjbh())){
                                             String[] _strArr=_str.split(" ");
                                             if (_strArr.length>8){
+                                                _lj.setTz(_strArr[7]);
                                                 _lj.setLx(_strArr[8]);
                                             }
+                                            if (_strArr.length>9){
+                                                _lj.setXj(_strArr[9]);
+                                            }
                                         }
                                     }
                                 }