托书调整

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

@@ -4,6 +4,7 @@ import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -16,12 +17,14 @@ import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList;
+import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
 import org.jeecg.modules.documents.syShippingOrder.service.ISyShippingOrderService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.documents.syShippingOrder.service.impl.SyShippingOrderItemServiceImpl;
 import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.splt.mapper.SyPackingListTailoringItemMapper;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -54,6 +57,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	private ISyShippingOrderService syShippingOrderService;
 	@Autowired
 	private SyPackingListTailoringItemMapper syPackingListTailoringItemMapper;
+	 @Autowired
+	private SyShippingOrderItemServiceImpl syShippingOrderItemService;
+	 @Resource
+	 private SyShippingOrderMapper syShippingOrderMapper;
+
 	
 	/**
 	 * 分页列表查询
@@ -202,9 +210,37 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	@AutoLog(value = "托书主表实体类-通过id查询")
 	@ApiOperation(value="托书主表实体类-通过id查询", notes="托书主表实体类-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<SyShippingOrder> queryById(@RequestParam(name="id",required=true) String id) {
+
+		Result<SyShippingOrder> result = new Result<>();
+
+		if(oConvertUtils.isEmpty(id)){
+			result.setSuccess(false);
+			result.setMessage("ID不能为空！");
+			return result;
+		}
 		SyShippingOrder syShippingOrder = syShippingOrderService.getById(id);
-		return Result.OK(syShippingOrder);
+
+		//查询子表数据
+		List<SyShippingOrderItem> list = syShippingOrderMapper.queryItem(id);
+		if(list.size()==0){
+			result.setSuccess(false);
+			result.setMessage("未找到子表数据！");
+			return result;
+		}
+		syShippingOrder.setSyShippingOrderItemList(list);
+
+		//查询人民币
+		List<SyRmb> listRmb = syShippingOrderMapper.queryListRmb(id);
+		syShippingOrder.setRmbList(listRmb);
+		//查询美元
+		List<SyUsd> listUsd = syShippingOrderMapper.queryListUsd(id);
+		syShippingOrder.setUsdList(listUsd);
+
+		result.setMessage("查询成功");
+		result.setSuccess(true);
+		result.setResult(syShippingOrder);
+		return result;
 	}
 
   /**
@@ -276,8 +312,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	  * @param syShippingOrder
 	  * @return
 	  */
-	 @AutoLog(value = "发运明细提交,(提交：type=1,取消提交：type = 0)")
-	 @ApiOperation(value = "发运明细提交,(提交：type=1,取消提交：type = 0)", notes="发运明细提交,(提交：type=1,取消提交：type = 0)")
+	 @AutoLog(value = "发运明细提交,(提交：type=1,取消提交：type = 2)")
+	 @ApiOperation(value = "发运明细提交,(提交：type=1,取消提交：type = 2)", notes="发运明细提交,(提交：type=1,取消提交：type = 2)")
 	 @PostMapping(value = "/syShippingDetailsSubmit")
 	 public Result<SyShippingOrder> syShippingDetailsSubmit(@RequestBody SyShippingOrder syShippingOrder) {
 

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

@@ -5,8 +5,11 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.letterDeposit.entity.SyRmb;
+import org.jeecg.modules.documents.letterDeposit.entity.SyUsd;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList;
 
 /**
@@ -29,4 +32,11 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
     //删除子表数据
     public void syShippingOrderItemDelete(@Param("id") String id);
 
+    //查询人民币
+    public List<SyRmb> queryListRmb(@Param("syLetterDepositId") String syLetterDepositId);
+    //查询美元
+    public List<SyUsd> queryListUsd(@Param("syLetterDepositId") String syLetterDepositId);
+    //查询子表数据
+    public List<SyShippingOrderItem> queryItem(@Param("id") String id);
+
 }

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

@@ -36,7 +36,7 @@
     <select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
     select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,a.depositary_receipt_no as depositaryReceiptNo,
-     b.inventory_name as productName,b.Remaining_Quantity as inventoryQuantity,
+     b.inventory_name as productName,sum(b.Remaining_Quantity) as inventoryQuantity,
      b.inventory_Code as itemCode,
      b.colour as colour,
      '面料' as readyFabric
@@ -54,4 +54,24 @@
         where sy_shipping_order_item_id = #{id}
     </update>
 
+    <select id="queryListRmb" resultType="org.jeecg.modules.documents.letterDeposit.entity">
+        select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,
+         amount,itemColumn,delFlag  from sy_rmb where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+    </select>
+
+    <select id="queryListUsd" resultType="org.jeecg.modules.documents.letterDeposit.entity">
+        select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,
+         amount,itemColumn,delFlag  from sy_usd where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+    </select>
+
+    <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
+SELECT GROUP_CONCAT(id), sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,
+sum(number) as number, sum(box_number) as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,
+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 purchaseOutsourcingOrderNo, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
+ memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId
+ FROM sy_shipping_order_item where del_flag = 0 and sy_shipping_order_item_id = #{id}
+group by sy_shipping_order_item_id
+
+    </select>
 </mapper>

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

@@ -108,6 +108,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         String id = oConvertUtils.id();
         syShippingOrder.setId(id);
         syShippingOrder.setDelFlag("0");
+        syShippingOrder.setTheDocumentsState("0");
         syShippingOrder.setCreateTime(new Date());
 
         //新增子表
@@ -139,9 +140,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setSyShippingOrderItemId(id);
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
-                        //查询主表获取剩余数量
-                        SyPackingListFabric entity = syPackingListFabricService.getById(li.getTailoringFabricId());
-                        syShippingOrderItem.setNumber(entity.getRemainingQuantity());//数量
+                        syShippingOrderItem.setNumber(itemli.getInventoryQuantity());//数量
 
                          itemList.add(syShippingOrderItem);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/InterfaceConnUtils.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.util;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.log4j.Log4j2;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -21,6 +22,7 @@ import java.util.Map;
  * @author 隔壁老赵
  *
  */
+@Log4j2
 public class InterfaceConnUtils {
 
     /**
@@ -98,7 +100,7 @@ public class InterfaceConnUtils {
             //返回信息
             String resultStr = EntityUtils.toString(response.getEntity());
             onejb=JSONObject.parseObject(resultStr);
-            System.out.println(type+"返回信息："+onejb);
+            log.info(type+"返回信息："+onejb);
 
         } catch (Exception e) {
             e.printStackTrace();