Browse Source

装箱单面料添加申报要素id

huxy 2 years ago
parent
commit
58194a113c

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -288,4 +288,5 @@ public class SyPackingListFabricItem implements Serializable {
 	//@Excel(name = "业务部门(销售部门)", width = 15)
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
+
 }

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -38,7 +38,7 @@
 			b.manual_Yarn_Unit_Price,/*手册纱单价*/
 			b.manual_Yarn_Proportion,/*手册纱占比*/
 			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
-			b.elements_Id,/*申报要素*/
+			b.elements_Id elementsId,/*申报要素*/
 			b.specification_And_Model,/*规格型号*/
 			b.excess_Quantity	/*excessQuantity*/
 		FROM
@@ -77,6 +77,7 @@
 			b.manual_Yarn_Proportion,/*手册纱占比*/
 			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
 			b.specification_And_Model,/*规格型号*/
+			b.elements_Id,/*申报要素*/
 			b.excess_Quantity	/*excessQuantity*/
 		FROM
 		sy_shipping_details a

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -102,6 +102,7 @@
 		/*and b.del_flag*/
 		${ew.customSqlSegment}
 		group by a.id
+		order by a.create_time desc
 	</select>
 
     <select id="selectById2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">