d6e710be by shiyunfei

111

1 parent 8ffc3d11
......@@ -24,6 +24,8 @@ public class BillSettlementDetail{
private String lot;
private Date productionDate;
private Date expireDate;
private BigDecimal tax; //税率
private BigDecimal discount; //折扣率
private Date create_time;
private Date update_time;
......@@ -134,5 +136,17 @@ public class BillSettlementDetail{
}
public void setUpdate_time(Date update_time) {
this.update_time = update_time;
}
public BigDecimal getTax() {
return tax;
}
public void setTax(BigDecimal tax) {
this.tax = tax;
}
public BigDecimal getDiscount() {
return discount;
}
public void setDiscount(BigDecimal discount) {
this.discount = discount;
}
}
......
......@@ -6,9 +6,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.phxl.modules.goods.entity.billback.BillBackWithDetail;
import org.apache.commons.fileupload.disk.DiskFileItem;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
......@@ -27,36 +24,25 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.phxl.common.constants.PlatformConstant;
import com.phxl.common.response.PlatFormResponse;
import com.phxl.common.response.PlatFormResponseConstant;
import com.phxl.common.util.HTTPClient;
import com.phxl.common.util.JsonMapper;
import com.phxl.common.utils.IdUtil;
import com.phxl.modules.goods.entity.billback.BillBack;
import com.phxl.modules.goods.entity.billsettlement.BillSettlement;
import com.phxl.modules.goods.entity.billback.BillBackWithDetail;
import com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail;
import com.phxl.modules.goods.entity.ctcareprov.CTCareProv;
import com.phxl.modules.goods.entity.ctdept.HisCtDept;
import com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial;
import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBack;
import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail;
import com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail;
import com.phxl.modules.goods.entity.medplan.MedPlan;
import com.phxl.modules.goods.entity.medplan.MedPlanWithDetail;
import com.phxl.modules.goods.entity.medstock.MedStock;
import com.phxl.modules.goods.entity.medstock.MedStockList;
import com.phxl.modules.goods.entity.spills.HisSpills;
import com.phxl.modules.goods.entity.spills.HisSpillsList;
import com.phxl.modules.goods.entity.suoutstore.SuOutStore;
import com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail;
import com.phxl.modules.goods.entity.supplierstock.SupplierStock;
import com.phxl.modules.goods.entity.supplierstock.SupplierStockList;
import com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods;
import com.phxl.modules.goods.service.billback.BillBackService;
......
......@@ -20,6 +20,8 @@
<result column="lot" property="lot" jdbcType="VARCHAR" />
<result column="production_date" property="productionDate" jdbcType="TIMESTAMP" />
<result column="expire_date" property="expireDate" jdbcType="TIMESTAMP" />
<result column="Tax" property="Tax" jdbcType="DECIMAL"/>
<result column="Discount" property="Discount" jdbcType="DECIMAL"/>
<result column="create_time" property="create_time" jdbcType="TIMESTAMP" />
<result column="update_time" property="update_time" jdbcType="TIMESTAMP" />
</resultMap>
......@@ -29,7 +31,7 @@
<!--批量插入BillBackDetail -->
<insert id="batchInsert" parameterType="list">
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)
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)
values
<foreach collection ="list" item="obj" separator =",">
<trim prefix=" (" suffix=")" suffixOverrides=",">
......@@ -47,6 +49,8 @@
#{obj.lot},
#{obj.productionDate},
#{obj.expireDate},
#{obj.Tax},
#{obj.Discount},
#{obj.create_time},
#{obj.update_time},
#{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!