浏览代码

推送u8逻辑调整

huxy 2 年之前
父节点
当前提交
73d744b534

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1818,6 +1818,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                             }else{
                                 if(cell!=null){
                                     cell.setCellType(CellType.STRING);//获取的都转换成String
+                                    System.out.println("cell\t"+cell.getStringCellValue());
                                     if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
                                         throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
                                                 sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1236,7 +1236,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			return null;
 		}*/
 		String isSucceed=null;
-		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null){//印花
+		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed().indexOf("-7-")>0){//印花
 			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//采购入库单
 			isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//采购入库单
 			isSucceed(main,isSucceed);