托书调整

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

@@ -155,7 +155,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		//queryWrapper.orderByDesc("a.create_time");
 		//queryWrapper.groupBy("a.shipping_order_number");
 		Page<SyShippingOrder> page = new Page<SyShippingOrder>(pageNo, pageSize);
-		IPage<SyShippingOrder> pageList = syShippingOrderService.syShippingOrderPageList(page, queryWrapper);
+		IPage<SyShippingOrder> pageList = syShippingOrderService.syShippingOrderPageList(page, queryWrapper,type);
 
 		result.setSuccess(true);
 		result.setMessage("查询成功！");
@@ -288,7 +288,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	@AutoLog(value = "托书主表实体类-通过id查询")
 	@ApiOperation(value="托书主表实体类-通过id查询", notes="托书主表实体类-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<SyShippingOrder> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<SyShippingOrder> queryById(@RequestParam(name="id",required=true) String id,@RequestParam(name="type",required=true) String type) {
 
 		Result<SyShippingOrder> result = new Result<>();
 
@@ -317,7 +317,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //		}
 
 		//查询子表数据
-		List<SyShippingOrderItem> list = syShippingOrderMapper.queryItem(id);
+		List<SyShippingOrderItem> list = syShippingOrderMapper.queryItem(id,type);
 		if(list.size()==0){
 			result.setSuccess(false);
 			result.setMessage("未找到子表数据！");

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

@@ -21,8 +21,8 @@ import org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList;
  */
 public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
 
-    //分页列表查询
-    IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, @Param("ew") QueryWrapper<SyShippingOrder> queryWrapper);
+    //分页列表查询成衣
+    IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, @Param("ew") QueryWrapper<SyShippingOrder> queryWrapper,@Param("type") String type);
 
     //查询装箱单-成衣
     IPage<SyPackingList> queryTailoring(IPage<SyPackingList> page, @Param("ew") QueryWrapper<SyPackingList> queryWrapper);
@@ -38,7 +38,7 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
     //查询美元
     public List<SyUsd> queryListUsd(@Param("syLetterDepositId") String syLetterDepositId);
     //查询子表数据
-    public List<SyShippingOrderItem> queryItem(@Param("id") String id);
+    public List<SyShippingOrderItem> queryItem(@Param("id") String id,@Param("type") String type);
 
     //查询报关要素合并信息(传主表ID)
     public List<SyShippingOrderItem> queryEelementMerge(@Param("id") String id);

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

@@ -18,14 +18,22 @@ a.sy_stuta as syStuta,a.is_ahaa as isAhaa
  from sy_shipping_order a
 left join sy_shipping_order_item b
 ON a.id = b.sy_shipping_order_item_id
-left join sy_packing_list_tailoring_item c
-on b.tailoring_fabric_item_id = c.id
+<if test='type == "成衣"'>
+    left join sy_packing_list_tailoring_item c
+    on b.tailoring_fabric_item_id = c.id
+</if>
+        <if test='type == "面辅料"'>
+            left join sy_packing_list_fabric_item c
+            on b.tailoring_fabric_item_id = c.id
+        </if>
+
  ${ew.customSqlSegment}
 group by c.group_id order by a.create_time desc) t group by t.shippingOrderNumber
 
     </select>
 
 
+
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 select a.id as id ,GROUP_CONCAT(DISTINCT b.id) as itemId,a.document_No as documentNo,a.order_Number as orderNumber,
@@ -103,8 +111,14 @@ a.distribution_point as distributionPoint, a.container_code as containerCode, a.
 a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcing_order_no as purOrSubOrder, a.outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
  a.memo, a.sort, a.ready_fabric as readyFabric, a.tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(a.tailoring_fabric_item_id) as tailoringFabricItemId,a.client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item a
-  left join sy_packing_list_tailoring_item c
-on a.tailoring_fabric_item_id = c.id
+        <if test='type == "成衣"'>
+            left join sy_packing_list_tailoring_item c
+            on a.tailoring_fabric_item_id = c.id
+        </if>
+        <if test='type == "面辅料"'>
+            left join sy_packing_list_fabric_item c
+            on a.tailoring_fabric_item_id = c.id
+        </if>
   where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
 group by c.group_id order by style_number,smail_po desc
     </select>

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

@@ -20,7 +20,7 @@ import java.util.Map;
 public interface ISyShippingOrderService extends IService<SyShippingOrder> {
 
     //分页列表查询
-    IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, QueryWrapper<SyShippingOrder> queryWrapper);
+    IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, QueryWrapper<SyShippingOrder> queryWrapper,String type);
 
     //查询装箱单-成衣
     IPage<SyPackingList> queryTailoring(IPage<SyPackingList> page, QueryWrapper<SyPackingList> queryWrapper);

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

@@ -73,8 +73,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
      * @return
      */
     @Override
-    public IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, QueryWrapper<SyShippingOrder> queryWrapper) {
-        return syShippingOrderMapper.syShippingOrderPageList(page, queryWrapper);
+    public IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, QueryWrapper<SyShippingOrder> queryWrapper,String type) {
+        return syShippingOrderMapper.syShippingOrderPageList(page, queryWrapper,type);
     }
 
     /**
@@ -201,7 +201,12 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
                         //报关单价 = 总金额/净重
-                        BigDecimal price = itemli.getTotalPrice().divide(itemli.getNetWeight(),4,BigDecimal.ROUND_DOWN);
+                        BigDecimal price = BigDecimal.ZERO;
+                        if(itemli.getNetWeight().compareTo(new BigDecimal(0.1)) == -1 ){
+                            price = itemli.getPrice();
+                        }else{
+                            price = itemli.getTotalPrice().divide(itemli.getNetWeight(),4,BigDecimal.ROUND_DOWN);
+                        }
                         syShippingOrderItem.setDeclarationUnitPrice(price);
                         syShippingOrderItem.setUnitPrice(new BigDecimal(li.getPrice()));//单价
                         syShippingOrderItem.setPreShipmentDate(itemli.getPreDeliveryDate());