| doc/20260918_销售台账产品增加包装规格.sql | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/sales/dto/ShippingProductDetailDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/sales/ShippingInfoMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/sales/ShippingProductDetailMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
doc/20260918_ÏúÊŲ̂Õ˲úÆ·Ôö¼Ó°ü×°¹æ¸ñ.sql
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ -- éå®å°è´¦äº§å表å¢å "å è£ è§æ ¼"åæ®µ SET @col_exists = ( SELECT COUNT(1) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'sales_ledger_product' AND COLUMN_NAME = 'packaging_spec' ); SET @ddl = IF(@col_exists = 0, 'ALTER TABLE sales_ledger_product ADD COLUMN packaging_spec VARCHAR(255) NULL COMMENT ''å è£ è§æ ¼'' AFTER unit', 'SELECT ''packaging_spec å·²åå¨ï¼è·³è¿'' AS msg'); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -33,6 +33,11 @@ private String specificationModel; /** * å è£ è§æ ¼ */ private String packagingSpec; private String productName; private List<StorageBlobDTO> storageBlobDTOs; src/main/java/com/ruoyi/sales/dto/ShippingProductDetailDto.java
@@ -10,6 +10,11 @@ private String specificationModel; /** * å è£ è§æ ¼ */ private String packagingSpec; private String productName; private BigDecimal deliveryQuantity; src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -62,6 +62,12 @@ private String unit; /** * å è£ è§æ ¼ */ @Excel(name = "å è£ è§æ ¼") private String packagingSpec; /** * æ°é */ @Excel(name = "æ°é") src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -9,6 +9,7 @@ T1.id, T1.sales_ledger_id, T1.warn_num, T1.packaging_spec, T1.quantity, T1.min_stock, T1.tax_rate, src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -21,6 +21,7 @@ sl.sales_contract_no, pm.model as specification_model, pm.unit, slp.packaging_spec, p.product_name, sl.customer_name, spd.totalQuantity, src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -11,20 +11,25 @@ <result column="shipping_info_id" property="shippingInfoId" /> </resultMap> <select id="getDetail" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto"> select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity, slp.packaging_spec from shipping_product_detail spd left join stock_inventory si on si.id = spd.stock_inventory_id left join product_model pm on pm.id = si.product_model_id left join product p on p.id = pm.product_id left join shipping_info sh on sh.id = spd.shipping_info_id left join sales_ledger_product slp on slp.id = sh.sales_ledger_product_id and slp.type = 1 where spd.shipping_info_id = #{id} </select> <select id="getDateilByShippingNo" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto"> select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity, slp.packaging_spec from shipping_product_detail spd left join shipping_info sp on sp.id = spd.shipping_info_id left join stock_inventory si on si.id = spd.stock_inventory_id left join product_model pm on pm.id = si.product_model_id left join product p on p.id = pm.product_id left join sales_ledger_product slp on slp.id = sp.sales_ledger_product_id and slp.type = 1 where sp.shipping_no = #{shippingNo} </select>