product-inventory-management-after.git

			@@ -202,7 +202,7 @@

			@TableField(exist = false)
			@ApiModelProperty(value = "发货状态")
			private String shippingStatus;
			private String shippingStatus = "待发货";
			/**
			* 产品状态
			*/

			@@ -22,9 +22,11 @@
			import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
			import com.ruoyi.sales.mapper.SalesLedgerMapper;
			import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
			import com.ruoyi.sales.mapper.ShippingInfoMapper;
			import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
			import com.ruoyi.sales.pojo.SalesLedger;
			import com.ruoyi.sales.pojo.SalesLedgerProduct;
			import com.ruoyi.sales.pojo.ShippingInfo;
			import com.ruoyi.sales.service.ISalesLedgerProductService;
			import lombok.AllArgsConstructor;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -74,6 +76,7 @@
			private ProductionProductOutputMapper productionProductOutputMapper;
			private ProductionProductInputMapper productionProductInputMapper;
			private QualityInspectMapper qualityInspectMapper;
			private ShippingInfoMapper shippingInfoMapper;

			private StockUtils stockUtils;

			@@ -117,6 +120,17 @@
			ledgerProduct.setInvoiceAmount(invoiceAmount);
			ledgerProduct.setNoInvoiceNum(noInvoiceNum);
			ledgerProduct.setNoInvoiceAmount(noInvoiceAmount);
			// 发货信息
			ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerProductId, ledgerProduct.getId())
			.orderByDesc(ShippingInfo::getCreateTime)
			.last("limit 1"));
			if(shippingInfo != null){
			ledgerProduct.setShippingDate(shippingInfo.getShippingDate());
			ledgerProduct.setShippingCarNumber(shippingInfo.getShippingCarNumber());
			ledgerProduct.setShippingStatus(shippingInfo.getStatus());
			}

			}
			}

			@@ -7,10 +7,6 @@
			<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
			SELECT
			T1.*,
			t3.shipping_car_number,
			t3.shipping_date,
			t3.status as shippingStatus,
			t3.shipping_date,
			CASE
			WHEN t2.qualitity > T1.quantity THEN 1
			ELSE 0
			@@ -18,7 +14,6 @@
			FROM
			sales_ledger_product T1
			LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
			LEFT JOIN shipping_info t3 ON T1.id = t3.sales_ledger_product_id
			<where>
			1=1
			<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
			@@ -28,6 +23,7 @@
			AND T1.type = #{salesLedgerProduct.type}
			</if>
			</where>
			ORDER BY T1.register_date DESC
			</select>
			<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
			select slp.*

	src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/sales/SalesLedgerProductMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史