Skip to content

Quilan / medicinal-supplier

Go to a project
Toggle navigation
Toggle navigation pinning
d6e710be by shiyunfei
Options

111

1 parent 8ffc3d11
Inline Side-by-side
Showing 3 changed files with 20 additions and 16 deletions
src/main/java/com/phxl/modules/goods/entity/billsettlement/BillSettlementDetail.java
...@@ -24,6 +24,8 @@ public class BillSettlementDetail{ ...@@ -24,6 +24,8 @@ public class BillSettlementDetail{
24 private String lot; 24 private String lot;
25 private Date productionDate; 25 private Date productionDate;
26 private Date expireDate; 26 private Date expireDate;
27 private BigDecimal tax; //税率
28 private BigDecimal discount; //折扣率
27 private Date create_time; 29 private Date create_time;
28 private Date update_time; 30 private Date update_time;
29 31
...@@ -134,5 +136,17 @@ public class BillSettlementDetail{ ...@@ -134,5 +136,17 @@ public class BillSettlementDetail{
134 } 136 }
135 public void setUpdate_time(Date update_time) { 137 public void setUpdate_time(Date update_time) {
136 this.update_time = update_time; 138 this.update_time = update_time;
139 }
140 public BigDecimal getTax() {
141 return tax;
142 }
143 public void setTax(BigDecimal tax) {
144 this.tax = tax;
145 }
146 public BigDecimal getDiscount() {
147 return discount;
148 }
149 public void setDiscount(BigDecimal discount) {
150 this.discount = discount;
137 } 151 }
138 } 152 }
......
src/main/java/com/phxl/modules/goods/web/spd/SpdControlller.java
...@@ -6,9 +6,6 @@ import java.util.List; ...@@ -6,9 +6,6 @@ import java.util.List;
6 6
7 import javax.servlet.http.HttpServletRequest; 7 import javax.servlet.http.HttpServletRequest;
8 8
9 import com.phxl.modules.goods.entity.billback.BillBackWithDetail;
10
11 import org.apache.commons.fileupload.disk.DiskFileItem;
12 import org.apache.http.HttpEntity; 9 import org.apache.http.HttpEntity;
13 import org.apache.http.HttpResponse; 10 import org.apache.http.HttpResponse;
14 import org.apache.http.client.HttpClient; 11 import org.apache.http.client.HttpClient;
...@@ -27,36 +24,25 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -27,36 +24,25 @@ import org.springframework.web.bind.annotation.RequestMethod;
27 import org.springframework.web.bind.annotation.RequestParam; 24 import org.springframework.web.bind.annotation.RequestParam;
28 import org.springframework.web.bind.annotation.ResponseBody; 25 import org.springframework.web.bind.annotation.ResponseBody;
29 import org.springframework.web.multipart.MultipartFile; 26 import org.springframework.web.multipart.MultipartFile;
30 import org.springframework.web.multipart.commons.CommonsMultipartFile;
31 27
32 import com.alibaba.fastjson.JSON; 28 import com.alibaba.fastjson.JSON;
33 import com.alibaba.fastjson.JSONObject; 29 import com.alibaba.fastjson.JSONObject;
34 import com.alibaba.fastjson.serializer.SerializerFeature;
35 import com.fasterxml.jackson.annotation.JsonFormat;
36 import com.phxl.common.constants.PlatformConstant; 30 import com.phxl.common.constants.PlatformConstant;
37 import com.phxl.common.response.PlatFormResponse; 31 import com.phxl.common.response.PlatFormResponse;
38 import com.phxl.common.response.PlatFormResponseConstant; 32 import com.phxl.common.response.PlatFormResponseConstant;
39 import com.phxl.common.util.HTTPClient; 33 import com.phxl.common.util.HTTPClient;
40 import com.phxl.common.util.JsonMapper;
41 import com.phxl.common.utils.IdUtil; 34 import com.phxl.common.utils.IdUtil;
42 import com.phxl.modules.goods.entity.billback.BillBack; 35 import com.phxl.modules.goods.entity.billback.BillBackWithDetail;
43 import com.phxl.modules.goods.entity.billsettlement.BillSettlement;
44 import com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail; 36 import com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail;
45 import com.phxl.modules.goods.entity.ctcareprov.CTCareProv; 37 import com.phxl.modules.goods.entity.ctcareprov.CTCareProv;
46 import com.phxl.modules.goods.entity.ctdept.HisCtDept; 38 import com.phxl.modules.goods.entity.ctdept.HisCtDept;
47 import com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial; 39 import com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial;
48 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBack;
49 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail; 40 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail;
50 import com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail; 41 import com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail;
51 import com.phxl.modules.goods.entity.medplan.MedPlan;
52 import com.phxl.modules.goods.entity.medplan.MedPlanWithDetail; 42 import com.phxl.modules.goods.entity.medplan.MedPlanWithDetail;
53 import com.phxl.modules.goods.entity.medstock.MedStock;
54 import com.phxl.modules.goods.entity.medstock.MedStockList; 43 import com.phxl.modules.goods.entity.medstock.MedStockList;
55 import com.phxl.modules.goods.entity.spills.HisSpills;
56 import com.phxl.modules.goods.entity.spills.HisSpillsList; 44 import com.phxl.modules.goods.entity.spills.HisSpillsList;
57 import com.phxl.modules.goods.entity.suoutstore.SuOutStore;
58 import com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail; 45 import com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail;
59 import com.phxl.modules.goods.entity.supplierstock.SupplierStock;
60 import com.phxl.modules.goods.entity.supplierstock.SupplierStockList; 46 import com.phxl.modules.goods.entity.supplierstock.SupplierStockList;
61 import com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods; 47 import com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods;
62 import com.phxl.modules.goods.service.billback.BillBackService; 48 import com.phxl.modules.goods.service.billback.BillBackService;
......
src/main/resources/mappings/billsettlement/BillSettlementDetailMapper.xml
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
20 <result column="lot" property="lot" jdbcType="VARCHAR" /> 20 <result column="lot" property="lot" jdbcType="VARCHAR" />
21 <result column="production_date" property="productionDate" jdbcType="TIMESTAMP" /> 21 <result column="production_date" property="productionDate" jdbcType="TIMESTAMP" />
22 <result column="expire_date" property="expireDate" jdbcType="TIMESTAMP" /> 22 <result column="expire_date" property="expireDate" jdbcType="TIMESTAMP" />
23 <result column="Tax" property="Tax" jdbcType="DECIMAL"/>
24 <result column="Discount" property="Discount" jdbcType="DECIMAL"/>
23 <result column="create_time" property="create_time" jdbcType="TIMESTAMP" /> 25 <result column="create_time" property="create_time" jdbcType="TIMESTAMP" />
24 <result column="update_time" property="update_time" jdbcType="TIMESTAMP" /> 26 <result column="update_time" property="update_time" jdbcType="TIMESTAMP" />
25 </resultMap> 27 </resultMap>
...@@ -29,7 +31,7 @@ ...@@ -29,7 +31,7 @@
29 31
30 <!--批量插入BillBackDetail --> 32 <!--批量插入BillBackDetail -->
31 <insert id="batchInsert" parameterType="list"> 33 <insert id="batchInsert" parameterType="list">
32 insert into med_bill_settlement_detail (id,settle_bill_no,row_no,goods_code,goods_name,settle_qty,unit,settle_price,settle_amount,regist_key,producer_name,lot,production_date,expire_date,create_time,update_time,goods_cate) 34 insert into med_bill_settlement_detail (id,settle_bill_no,row_no,goods_code,goods_name,settle_qty,unit,settle_price,settle_amount,regist_key,producer_name,lot,production_date,expire_date,tax,discount,create_time,update_time,goods_cate)
33 values 35 values
34 <foreach collection ="list" item="obj" separator =","> 36 <foreach collection ="list" item="obj" separator =",">
35 <trim prefix=" (" suffix=")" suffixOverrides=","> 37 <trim prefix=" (" suffix=")" suffixOverrides=",">
...@@ -47,6 +49,8 @@ ...@@ -47,6 +49,8 @@
47 #{obj.lot}, 49 #{obj.lot},
48 #{obj.productionDate}, 50 #{obj.productionDate},
49 #{obj.expireDate}, 51 #{obj.expireDate},
52 #{obj.Tax},
53 #{obj.Discount},
50 #{obj.create_time}, 54 #{obj.create_time},
51 #{obj.update_time}, 55 #{obj.update_time},
52 #{obj.goodsCate} 56 #{obj.goodsCate}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!