发运明细提交判断，托书费用支出，

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

@@ -653,7 +653,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   public Result<SyShippingDetails> syShippingDetailsSubmit(@RequestBody SyShippingDetails syShippingDetails) {
 
 	  Result<SyShippingDetails> result = new Result<>();
-
+	  int count = 1;
 	  try {
 
 		  if(syShippingDetails.getSubmitListId().size()==0){
@@ -673,6 +673,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			}
 		  }
 
+
 		  //查询是否已提交
 		  QueryWrapper<SyShippingDetailsItem> itemQueryWrapper = new QueryWrapper<>();
 		  itemQueryWrapper.in("id",idsList);
@@ -685,12 +686,36 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 						  result.setMessage("部分单据已提交，请勿重复提交！");
 						  return result;
 					  }
+
 					  //判断物料成份。isTc、款号是否为空，为空不允许提交
 					  if(oConvertUtils.isEmpty(li.getItemNumber()) || oConvertUtils.isEmpty(li.getMaterialComposition()) || oConvertUtils.isEmpty(li.getIsTc())){
 						  result.setSuccess(false);
 						  result.setMessage("物料成份/款号/是否TC 未维护，不允许提交！");
 						  return result;
 					  }
+					  
+				  }
+				  //判断重复自由项数据
+				  for(String str:syShippingDetails.getGrouyIdList()) {
+					  QueryWrapper<SyShippingDetailsItem> queryWrapper = new QueryWrapper<>();
+					  queryWrapper.in("group_id", str).eq("del_flag", 0);
+					  List<SyShippingDetailsItem> groupList = syShippingDetailsItemService.list(itemQueryWrapper);
+					  for (int i = 0; i < groupList.size(); i++) {
+						  SyShippingDetailsItem tableRow = groupList.get(i);
+						  for (int j = i+1; j < groupList.size(); j++) {
+							  SyShippingDetailsItem nextData = groupList.get(j);
+							  if (tableRow.getSmallPo().equals(nextData.getSmallPo()) && tableRow.getOrderNumber().equals(nextData.getOrderNumber()) &&
+									  tableRow.getPreDeliveryDate().equals(nextData.getPreDeliveryDate()) && tableRow.getPreCompletionDate().equals(nextData.getPreCompletionDate()) &&
+									  tableRow.getItemNumber().equals(nextData.getItemNumber()) && tableRow.getInventoryCode().equals(nextData.getInventoryCode()) &&
+									  tableRow.getColour().equals(nextData.getColour()) && tableRow.getSize().equals(nextData.getSize())) {
+								  result.setSuccess(false);
+								  result.setMessage("第"+count+"条里面的第"+(i+1)+"行和第"+(j+1)+"行数据相同，无法提交");
+								  return result;
+							  }
+						  }
+
+					  }
+					  count++;
 				  }
 			  }else{
 				  for (SyShippingDetailsItem li : list) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetails.java

@@ -152,6 +152,12 @@ public class SyShippingDetails {
 	@TableField(exist = false)
 	List<String> submitListId;
 
+	/**分组ID集合*/
+	@Excel(name = "分组ID集合", width = 15)
+	@ApiModelProperty(value = "分组ID集合")
+	@TableField(exist = false)
+	List<String> grouyIdList;
+
 	//订单子表ID
 	@TableField(exist = false)
 	private List<String> itemId;

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

@@ -21,6 +21,7 @@ import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyRmb;
 import org.jeecg.modules.documents.letterDeposit.entity.SyUsd;
+import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositMapper;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElementsItem;
 import org.jeecg.modules.documents.seclarationElements.service.impl.SyDeclarationElementsItemServiceImpl;
@@ -72,6 +73,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 private SyShippingOrderMapper syShippingOrderMapper;
 	 @Autowired
 	 private SysDictServiceImpl sysDictService;
+	 @Resource
+	 private SyLetterDepositMapper syLetterDepositMapper;
 
 	
 	/**
@@ -694,7 +697,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
 					itemQueryWrapper.eq("sy_declaration_elements_id",li.getElementsId()).eq("del_flag",0);
                     List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
-
+                    if(itemList1.size()==0){
+                    	result.setSuccess(false);
+                    	result.setMessage("报关要素未维护！");
+                    	return result;
+					}
 					map1.put("name",i+"、商品编码:");
 					map1.put("value",elementEntity.getInventoryCode());
 					listMap.add(map1);
@@ -1036,4 +1043,52 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 }
 
 
+	 /**
+	  * 人民币美元修改
+	  * @param syShippingOrder
+	  * @return
+	  */
+	 @PostMapping(value = "/updateUSD_RMB")
+	 public Result<SyShippingOrder> updateUSD_RMB(@RequestBody SyShippingOrder syShippingOrder){
+
+		 Result<SyShippingOrder> result = new Result<SyShippingOrder>();
+
+		 //人民币
+		 if(syShippingOrder.getRmbList().size()==0){
+			 //删除人民币信息
+			 syLetterDepositMapper.syRmbDelete(syShippingOrder.getId());
+		 }else{
+		 	 //先删除再新增
+			 syLetterDepositMapper.syRmbDelete(syShippingOrder.getId());
+			 for(SyRmb li:syShippingOrder.getRmbList()){
+				 li.setId(oConvertUtils.id());
+				 li.setSyLetterDepositId(syShippingOrder.getId());
+				 li.setDelFlag("0");
+			 }
+			 syLetterDepositMapper.syRmbAdd(syShippingOrder.getRmbList());
+
+		 }
+		 //美元
+		 if(syShippingOrder.getUsdList().size()==0){
+			 //删除美元信息
+			 syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
+		 }else{
+			 //先删除再新增
+			 syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
+			 for(SyUsd li:syShippingOrder.getUsdList()){
+				 li.setId(oConvertUtils.id());
+				 li.setSyLetterDepositId(syShippingOrder.getId());
+				 li.setDelFlag("0");
+			 }
+			 syLetterDepositMapper.syUsdAdd(syShippingOrder.getUsdList());
+		 }
+
+		 result.setMessage("修改成功！");
+		 result.setSuccess(true);
+		 result.setResult(syShippingOrder);
+		 return  result;
+	 }
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -235,6 +235,11 @@ public class SyShippingOrder {
 	@TableField(exist = false)
 	private List<String> ids;
 
+	/**同步状态*/
+	@Excel(name = "同步状态", width = 15)
+	@ApiModelProperty(value = "同步状态")
+	private String syStuta;
+
 	//成衣工厂
 	@TableField(exist = false)
 	private String garmentFactory;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -83,7 +83,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,create_by as createBy,
-sum(number) as number, box_number as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, case when ready_fabric != '成衣' then volume else sum(volume) end as volume,sum(total_price) as totalPrice,
+sum(number) as number, box_number as boxNumber, gross_weight as grossWeight, net_weight as netWeight, case when ready_fabric != '成衣' then volume else volume end as volume,sum(total_price) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
  memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(tailoring_fabric_item_id) as tailoringFabricItemId,client_abbreviation as clientAbbreviation

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -430,6 +430,12 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
     @Override
     public void syShippingOrderItemDelete(String id) {
 
+        //删除美元信息
+        syLetterDepositMapper.syUsdDelete(id);
+        //删除人民币信息
+        syLetterDepositMapper.syRmbDelete(id);
+
+
         //回写装箱单是否被参照
         QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("sy_shipping_order_item_id",id).eq("del_flag","0");