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

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

@@ -84,11 +84,31 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    private String drugName;
    private String orgCode;
    private String drudId;
    public Mediicinestockoutdetail() {
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getDrudId() {
        return drudId;
    }
    public void setDrudId(String drudId) {
        this.drudId = drudId;
    }
    public String getIdStockOut() {
        return idStockOut;
    }

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

@@ -89,9 +89,29 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
     */
    private String warehouses;
    private String orgCode;
    private String drugId;
    public Mediicinestockupdetail() {
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getDrugId() {
        return drugId;
    }
    public void setDrugId(String drugId) {
        this.drugId = drugId;
    }
    public String getIdstockup() {
        return idstockup;
    }

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

@@ -58,7 +58,11 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    private HibenateUtils hibenateUtils;
    /**
     * 生成出货单
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String createDetailOut(String jsonData) {
@@ -89,7 +93,8 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        mediicinestockout.setDocTime(new Date());
        mediicinestockout.setCommunity(mediicinedevice.getBelongCommunity());
        mediicinestockout.setAddress(mediicinedevice.getDetailAddress());
        mediicinestockout.setReplenishCate("药品");
        //待补品类
        mediicinestockout.setReplenishCate(String.valueOf(obj.getDrugs().size()));
        mediicinestockout.setState("1");
        mediicinestockout.setReplenishInventory(obj.getDrugs().stream().reduce(0, (sum, p) -> sum += p.getQty() , Integer::sum).toString());
        //备货单号
@@ -100,6 +105,8 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            Mediicinestockoutdetail mediicinestockoutdetail = new Mediicinestockoutdetail();
            mediicinestockoutdetail.setIdStockOut(mediicinestockout.getId());
            mediicinestockoutdetail.setDrugCode(mediicinedrugs.getDrugCode());
            mediicinestockoutdetail.setDrudId(mediicinedrugs.getId());
            mediicinestockoutdetail.setOrgCode(mediicinedrugs.getOrgCode());
            mediicinestockoutdetail.setQuantity(drug.getQty().toString());
            mediicinestockoutdetail.setProductPic(mediicinedrugs.getPic());
            outdetailDao.save(mediicinestockoutdetail);

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

@@ -12,6 +12,8 @@ import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +49,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    @Autowired
    private RoleDao roleDao;
    @Autowired
    private HospitalDao hospitalDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -86,7 +91,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            mediicinestockup.setCommunity(mediicinedevice.getBelongCommunity());
            mediicinestockup.setDocTime(new Date());
            mediicinestockup.setDocNum(String.valueOf(System.currentTimeMillis()));
            mediicinestockup.setReplenishCate(String.valueOf(list.size()));
            //待补品类，
            mediicinestockup.setReplenishCate(String.valueOf(upDO.getDrugs().size()));
            mediicinestockup.setReplenishEqu(upDO.getDeviceId());
            mediicinestockup.setState("1");
            mediicinestockup.setReplenishInventory(String.valueOf(upDO.getDrugs().stream().mapToInt(DrugDO::getQty).sum()));
@@ -100,6 +106,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                Mediicinestockupdetail mediicinestockupdetail = new Mediicinestockupdetail();
                mediicinestockupdetail.setIdstockup(mediicinestockup.getId());
                mediicinestockupdetail.setDrugCode(mediicinedrugs.getDrugCode());
                mediicinestockupdetail.setOrgCode(mediicinedrugs.getOrgCode());
                mediicinestockupdetail.setDrugId(mediicinedrugs.getId());
                mediicinestockupdetail.setDrugName(mediicinedrugs.getDrugName());
                mediicinestockupdetail.setProductPic(mediicinedrugs.getPic());
                mediicinestockupdetail.setOutofstock(drug.getQty().toString());
@@ -328,6 +336,12 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        return updetailDao.getoutdetail(idstockup);
    }
    /**
     * 通过备货单id，查询备货单详情内容
     * @param idstockup
     * @return
     */
    public JSONObject getUpDetailById(String idstockup) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(idstockup)){
@@ -336,6 +350,11 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        Mediicinestockup mediicinestockup = upDao.findOne(idstockup);
        //备货单详情页，设备地址，从code,转化为name
        mediicinestockup.setCommunity(hospitalDao.findByCode(mediicinestockup.getCommunity()).getName());
        jsonObject.put("info", upDao.findOne(idstockup));
        jsonObject.put("list", updetailDao.getoutdetail(idstockup));
        result.put("msg", jsonObject);