Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedrugs.java

@@ -92,7 +92,7 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
    /**
     * 售价
     */
    private float price;
    private Float price;
    /**
     * 库存
@@ -252,11 +252,11 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
        this.unit = unit;
    }
    public float getPrice() {
    public Float getPrice() {
        return price;
    }
    public void setPrice(float price) {
    public void setPrice(Float price) {
        this.price = price;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -50,13 +50,13 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     * 交易金额
     */
    private float amount;
    private Float amount;
    /**
     * 实收销售额
     */
    private float netSaleAmount;
    private Float netSaleAmount;
    /**
     * 商品总金额
@@ -213,19 +213,19 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.prescribeNum = prescribeNum;
    }
    public float getAmount() {
    public Float getAmount() {
        return amount;
    }
    public void setAmount(float amount) {
    public void setAmount(Float amount) {
        this.amount = amount;
    }
    public float getNetSaleAmount() {
    public Float getNetSaleAmount() {
        return netSaleAmount;
    }
    public void setNetSaleAmount(float netSaleAmount) {
    public void setNetSaleAmount(Float netSaleAmount) {
        this.netSaleAmount = netSaleAmount;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorderdetail.java

@@ -30,7 +30,7 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
    /**
     * 售价
     */
    private float price;
    private Float price;
    /**
     * 数量
@@ -86,13 +86,13 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
     * 交易金额
     */
    private float amount;
    private Float amount;
    /**
     * 实收销售额
     */
    private float netSaleAmount;
    private Float netSaleAmount;
    /**
     * 商品总金额
@@ -220,11 +220,11 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
        this.medInfo = medInfo;
    }
    public float getPrice() {
    public Float getPrice() {
        return price;
    }
    public void setPrice(float price) {
    public void setPrice(Float price) {
        this.price = price;
    }
@@ -308,19 +308,19 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
        this.prescribeNum = prescribeNum;
    }
    public float getAmount() {
    public Float getAmount() {
        return amount;
    }
    public void setAmount(float amount) {
    public void setAmount(Float amount) {
        this.amount = amount;
    }
    public float getNetSaleAmount() {
    public Float getNetSaleAmount() {
        return netSaleAmount;
    }
    public void setNetSaleAmount(float netSaleAmount) {
    public void setNetSaleAmount(Float netSaleAmount) {
        this.netSaleAmount = netSaleAmount;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockout.java

@@ -14,6 +14,11 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
    /**
     * 金额
     */
    private String price;
    /**
     * community
     */
@@ -77,6 +82,13 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
    public Mediicinestockout() {
    }
    public String getPrice() {
        return price;
    }
    public void setPrice(String price) {
        this.price = price;
    }
    public String getCommunity() {
        return community;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockoutdetail.java

@@ -35,7 +35,7 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    /**
     * 售价
     */
    private float price;
    private Float price;
    /**
     * 数量
@@ -110,11 +110,11 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
        this.medInfo = medInfo;
    }
    public float getPrice() {
    public Float getPrice() {
        return price;
    }
    public void setPrice(float price) {
    public void setPrice(Float price) {
        this.price = price;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockupdetail.java

@@ -15,7 +15,7 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
    /**
     * idstockup
     */
    private String idStockUp;
    private String idstockup;
    /**
     * orderno
@@ -30,7 +30,7 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
    /**
     * 售价
     */
    private double price;
    private Double price;
    /**
     * 数量
@@ -71,13 +71,12 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
    }
    public String getIdStockUp() {
        return idStockUp;
    public String getIdstockup() {
        return idstockup;
    }
    public void setIdStockUp(String idStockUp) {
        this.idStockUp = idStockUp;
    public void setIdstockup(String idstockup) {
        this.idstockup = idstockup;
    }
    public String getOrderNo() {
@@ -96,11 +95,11 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
        this.medInfo = medInfo;
    }
    public double getPrice() {
    public Double getPrice() {
        return price;
    }
    public void setPrice(double price) {
    public void setPrice(Double price) {
        this.price = price;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinewarray.java

@@ -90,11 +90,11 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
    /**
     * 温度信息
     */
    private float temperature;
    private Float temperature;
    /**
     * 湿度信息
     */
    private float humidity;
    private Float humidity;
    /**
     * 所属
     */
@@ -145,7 +145,7 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
    /**
     * 使用时长
     */
    private long duration;
    private Long duration;
    /**
     * 出货异常次数
     */
@@ -284,19 +284,19 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
        this.signalIntensity = signalIntensity;
    }
    public float getTemperature() {
    public Float getTemperature() {
        return temperature;
    }
    public void setTemperature(float temperature) {
    public void setTemperature(Float temperature) {
        this.temperature = temperature;
    }
    public float getHumidity() {
    public Float getHumidity() {
        return humidity;
    }
    public void setHumidity(float humidity) {
    public void setHumidity(Float humidity) {
        this.humidity = humidity;
    }
@@ -372,11 +372,11 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
        this.exceed = exceed;
    }
    public long getDuration() {
    public Long getDuration() {
        return duration;
    }
    public void setDuration(long duration) {
    public void setDuration(Long duration) {
        this.duration = duration;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinestockupdetailDao.java

@@ -11,6 +11,6 @@ import java.util.List;
public interface MediicinestockupdetailDao extends PagingAndSortingRepository<Mediicinestockupdetail, String> {
    //按订单号出货明细
    @Query("select a from Mediicinestockupdetail a where a.idStockUp =  ?1 ")
    @Query("select a from Mediicinestockupdetail a where a.idstockup =  ?1 ")
    List<Mediicinestockupdetail> getoutdetail(String idstockup);
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockOutService.java

@@ -138,6 +138,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                "    t.id as id,\n" +
                "    t.address as address,\n" +
                "    t.community as community,\n" +
                "    t.price as price,\n" +
                "    t.doc_num as docNum,\n" +
                "    t.doc_time as docTime,\n" +
                "    t.receive_state as receiveState,\n" +
@@ -177,7 +178,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_order t " +
                "     t_mediicine_stockout t " +
                "  where " +
                "  1=1   " +
                conditionSql;

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@@ -175,7 +175,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_order t " +
                "     t_mediicine_stockup t " +
                "  where " +
                "  1=1   " +
                conditionSql;