销售订单添加毛利信息

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -864,6 +864,10 @@ public class SaleorderitemController {
         if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
             vo.setCustomerName(customerEntity.getSupplierNm());
         }
+
+        List<Salesorder_item0Entity> poundlistsalor = saleorderitemService.GetPoundlistSaleOrderItemInfo(id);
+        vo.setPoundsalesorderList(poundlistsalor);
+
 //						Map<String,Object> contractCodeMap = new HashMap<>();
 //            vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap));
 //						Map<String,Object> costomerCodeMap = new HashMap<>();

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java

@@ -162,6 +162,19 @@ public class Salesorder_item0Entity  {
     @TableField(exist = false)
     private String vehicleName;
 
+    @TableField(exist = false)
+    private String ticketno;
+
+    @TableField(exist = false)
+    private String purchasePrice;
+
+    @TableField(exist = false)
+    private String aprice;
+
+    @TableField(exist = false)
+    private String maoli;
 
+    @TableField(exist = false)
+    private String pricedifference;
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java

@@ -35,4 +35,6 @@ public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
     double querySaleorderNumStatistics(String date);
 
     double querySaleorderAmountStatistics(String date);
+
+    List<Salesorder_item0Entity> queryPoundlistSaleOrderItem(String id);
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java

@@ -5,6 +5,7 @@ package jnpf.saleorder.model.saleorderitem;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import jnpf.poundlist.entity.PoundlistEntity;
+import jnpf.saleorder.entity.Salesorder_item0Entity;
 import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model;
 import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel;
 import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel;
@@ -119,6 +120,10 @@ public class SaleorderitemInfoVO{
         @JsonProperty("paymentsoitemList")
         private List<PaymentsoitemModel> paymentsoitemList;
 
+
+        @TableField("Salesorder_item0Entity")
+        private List<Salesorder_item0Entity> poundsalesorderList;
+
         /** 合同id**/
         @TableField("contractId")
         private String contractId;

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java

@@ -52,5 +52,7 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
 
     double querySaleorderAmountStatistics(String date);
 
+
+    List<Salesorder_item0Entity> GetPoundlistSaleOrderItemInfo(String id);
     //列表子表数据方法
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java

@@ -587,6 +587,12 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         return saleorderitemMapper.querySaleorderAmountStatistics(date);
     }
 
+    @Override
+    public List<Salesorder_item0Entity> GetPoundlistSaleOrderItemInfo(String id) {
+        return saleorderitemMapper.queryPoundlistSaleOrderItem(id);
+    }
+
+
     //列表子表数据方法
 
 

SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml

@@ -117,6 +117,53 @@ FROM
 	        AND a.sales_order_id = #{id}
     </select>
 
+    <select id="queryPoundlistSaleOrderItem" resultType="jnpf.saleorder.entity.Salesorder_item0Entity">
+
+SELECT
+ticketno,
+d.item_name,
+case
+a.pound_type
+when 0 then '贸易'
+when 1 then '自加工'
+when 2 then '委外'
+when 3 then '倒运'
+else null
+end as pound_type,
+a.settlement,
+ROUND(e.price/( 1+( CASE e.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END )),2) AS purchase_price,
+-- ROUND(e.price/( 1+( CASE e.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END ))*a.settlement,2) AS aprice,
+e.not_amount AS aprice,
+-- ROUND(purchase_price*a.settlement,2) AS  aprice,
+ROUND(b.unit_price/( 1+( CASE b.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END )),2) AS unit_price,
+-- b.unit_price AS  unit_price,
+-- b.price AS price,
+b.no_price AS price,
+
+-- b.no_price-ROUND(purchase_price*a.settlement,2) AS maoli1,
+b.no_price-e.not_amount AS maoli,
+-- (b.no_price-ROUND(purchase_price*a.settlement,2))/a.settlement AS pricedifference,
+ROUND((b.no_price-e.not_amount)/a.settlement,2) AS pricedifference,
+case
+a.advance
+when 0 then '否'
+when 1 then '是'
+else null
+end as advance
+
+FROM
+jg_poundlist a
+LEFT JOIN jg_salesorder_item0 b ON a.id=b.poundlist_id AND b.delete_mark='0'
+LEFT JOIN jg_vehicle c ON a.vehicle_id=c.id AND c.delete_mark='0'
+LEFT JOIN jg_material d ON a.material_id=d.id AND d.delete_mark='0'
+LEFT JOIN jg_purchaseorder_item0 e ON a.id=e.poundlist_id AND e.delete_mark='0'
+WHERE
+1=1
+AND a.delete_mark='0'
+AND
+b.sales_order_id=#{id}
+    </select>
+
     <select id="querySaleorderNumStatistics" resultType="Double">
         select IFNULL(convert(SUM(num),decimal(15,2)), 0) from jg_salesorder where DATE_FORMAT(creator_time,'%Y-%m-%d') = #{date} and (status = '2' OR status = '3')
     </select>