wangzhinan 1 vuosi sitten
vanhempi
commit
879a842434

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

@ -240,6 +240,19 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
     */
    private String orgCode;
    /**
     * 数量单位
     */
    private String quantityUnit;
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public Mediicineorderdetail() {
    }

+ 2 - 2
svr/svr-base/pom.xml

@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-base</artifactId>
    <artifactId>svr-base-yg</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@ -232,7 +232,7 @@
    </dependencies>
    <build>
        <finalName>svr-base</finalName>
        <finalName>svr-base-yg</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

+ 4 - 3
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@ -1545,7 +1545,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                        mediicineorderdetail.setDrugCode(drugObj.getString("ITEM_CODE"));
                                        mediicineorderdetail.setOrderNo(realOrder);
                                        mediicineorderdetail.setPrice(drugObj.getFloat("ITEM_PRICE"));
                                        mediicineorderdetail.setQuantity(quantity);
                                        mediicineorderdetail.setQuantity(drugObj.getString("ITEM_QUANTITY_C_Q"));
                                        mediicineorderdetail.setQuantityUnit(drugObj.getString("ITEM_QUANTITY_C_U"));
                                        mediicineorderdetail.setGoodsName(drugObj.getString("ITEM_NAME"));
                                        mediicineorderdetail.setOrderState("1");
                                        mediicineorderdetail.setPickUpNum(realOrder);
@ -2495,8 +2496,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            shipmentLog.setPic(mediicinedrugs.getPic());
                            shipmentLog.setPrice(mediicinedrugs.getPrice());
                            shipmentLog.setSpecif(mediicinedrugs.getSpecif());
                            shipmentLog.setUnit(mediicinedrugs.getUnit());
                            shipmentLog.setQuantityUnit(mediicineorderdetail.getUnit());
                            shipmentLog.setUnit(mediicineorderdetail.getUnit());
                            shipmentLog.setQuantityUnit(mediicineorderdetail.getQuantityUnit());
                            String drugSql = " select quantity_unit,pack_unit from t_mediicine_drugs where org_code='"+mediicinedrugs.getOrgCode()+"' and drug_code='"+mediicinedrugs.getDrugCode()+"' ";
                            List<Map<String,Object>> drugTmps = jdbcTemplate.queryForList(drugSql);
                            if (drugTmps.size()>0){