托书编辑调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -108,7 +108,7 @@ hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubO
 
     <select id="printItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
-         select itemNumber,sum(boxNumber) as boxNumber,smallPo,total,sum(totalGrossWeight) as totalGrossWeight,sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,containerCode,containerNumber,unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,englishName,pcs,ctns,kgs,cbm from(
+         select itemNumber,sum(boxNumber) as boxNumber,smallPo,sum(total) as total,sum(totalGrossWeight) as totalGrossWeight,sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,containerCode,containerNumber,unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,englishName,pcs,ctns,kgs,cbm from(
  select a.item_number as itemNumber,a.small_po as smallPo,round(sum(a.total),2) as total,round(a.box_number,0) as boxNumber,
 round(a.total_gross_weight,2) as totalGrossWeight,round(a.total_net_weight,2) as totalNetWeight,round(a.total_volume,3) as totalVolume,
 a.container_code as containerCode,a.container_number as containerNumber,a.unit_price as unitPrice,sum(a.total_price) as totalPrice,letter_groupid as letterGroupid,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -623,6 +623,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  builder1.append(si.getItemId());
 					  builder1.append(",");
 				  }
+				  builder1.deleteCharAt(builder1.length()-1);
 				  //创建列名放在第一行
 				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*净净重*客户简称*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
 				  String[] params1 =syPreList.get(index).toString(builder.toString(),builder1.toString()).split("\\*");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -219,12 +219,12 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		}
 
 		//判断是否已提交
-		SyShippingOrder pojo = syShippingOrderService.getById(syShippingOrder.getId());
-		if(pojo.getTheDocumentsState().equals("1")){
-			result.setSuccess(false);
-			result.setMessage("单据已提交，不允许修改！");
-			return result;
-		}
+//		SyShippingOrder pojo = syShippingOrderService.getById(syShippingOrder.getId());
+//		if(pojo.getTheDocumentsState().equals("1")){
+//			result.setSuccess(false);
+//			result.setMessage("单据已提交，不允许修改！");
+//			return result;
+//		}
 
 		syShippingOrderService.syShippingOrderEdit(syShippingOrder);