跟新相关bug

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

@@ -83,6 +83,11 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
     */
    private Integer trackNum;
    /**
     * 1已导入
     */
    private Integer status;
    public Mediicinestockup() {
    }
@@ -189,4 +194,12 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
    public void setReplenishErName(String replenishErName) {
        this.replenishErName = replenishErName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -81,6 +81,9 @@ public class BaseRequestMapping {
        public static final String CREATE  = "/create";
        public static final String createUp  = "/createUp";
        public static final String getUpDetailListById  = "/getUpDetailListById";
        public static final String updateStockUpStatus = "/updateStockUpStatus";
        public static final String queryUpListByDeviceIdAndStatus = "/queryUpListByDeviceIdAndStatus";
        public static final String queryUpListByStatus = "/queryUpListByStatus";
        public static final String getUpDetailById  = "/getUpDetailById";
        public static final String getRecordDetailListById  = "/getRecordDetailListById";
        public static final String getUpDetailByUserIdAndDeviceId  = "/getUpDetailByUserIdAndDeviceId";

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

@@ -18,4 +18,10 @@ public interface MediicinestockupDao extends PagingAndSortingRepository<Mediicin
    @Query(" select id as id from Mediicinestockup where replenishEr = ?1 and replenishEqu = ?2 and state = ?3")
    List<String> selectUpIdsByReplenishErAndReplenishEquAndState(String userId, String deviceId, String state);
    @Query(" select  a from Mediicinestockup a where a.replenishEr = ?1 and a.replenishEqu = ?2 and a.state = '1' and a.status <>2")
    List<Mediicinestockup> selectUpIdsByReplenishErAndReplenishEquAndStateList(String userId, String deviceId);
    @Query(" select a from Mediicinestockup a where a.replenishEr = ?1 and a.replenishEqu = ?2 and a.state = '1' and a.status =1")
    List<Mediicinestockup> selectUpIdsByReplenishErAndReplenishEquAndStatusList(String userId, String deviceId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineUpEndpoint.java

@@ -8,6 +8,7 @@ import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -132,6 +133,36 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.queryUpListByStatus)
    @ApiOperation(value = "查询已生成备货单" , notes="查询已生成备货单")
    public ListEnvelop<Mediicinestockup> queryUpListByStatus(
            @ApiParam(name = "replenishEr", value = "补货员id", required = false)
            @RequestParam(value = "replenishEr",required = false) String replenishEr,
            @ApiParam(name = "deviceId", value = "设备id", required = false)
            @RequestParam(value = "deviceId",required = false) String deviceId) throws Exception {
        return success(stockupService.queryUpListByStatus(replenishEr,deviceId));
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.queryUpListByDeviceIdAndStatus)
    @ApiOperation(value = "查询未完成备货单" , notes="查询未完成备货单")
    public ListEnvelop<Mediicinestockup> queryUpListByDeviceIdAndStatus(
            @ApiParam(name = "replenishEr", value = "补货员id", required = false)
            @RequestParam(value = "replenishEr",required = false) String replenishEr,
            @ApiParam(name = "deviceId", value = "设备id", required = false)
            @RequestParam(value = "deviceId",required = false) String deviceId) throws Exception {
        return success(stockupService.queryUpListByDeviceIdAndStatus(replenishEr,deviceId));
    }
    @PostMapping(value = BaseRequestMapping.BaseUp.updateStockUpStatus)
    @ApiOperation(value = "更新备货单状态" , notes="更新备货单状态")
    public Envelop updateStockUpStatus(
            @ApiParam(name = "id", value = "备货单id", required = false)
            @RequestParam(value = "id",required = false) String id,
            @ApiParam(name = "status", value = "导入1，完成 2", required = false)
            @RequestParam(value = "status",required = false) Integer status) throws Exception {
        return success(stockupService.updateStockUpStatus(id,status));
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.getUpDetailById)
    @ApiOperation(value = "备货单id获取备货详细信息" , notes="获取药品备货详细信息")
    public Envelop getUpDetailById(

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

@@ -110,6 +110,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        mediicinestockup.setReplenishErName(userDO.getName());
        mediicinestockup.setState("1");
        mediicinestockup.setReplenishEr(obj.getReplenishEr());
        mediicinestockup.setStatus(0);
        upDao.save(mediicinestockup);
        //需要补货的设备
        Mediicinedevice mediicinedevice = deviceDao.findOne(obj.getDeviceId());

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

@@ -382,6 +382,41 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    }
    /**
     * 查询已生成备货单
     * @param replenishEr
     * @param deviceId
     * @return
     * @throws Exception
     */
    public List<Mediicinestockup> queryUpListByStatus(String replenishEr,String deviceId) throws Exception {
       return upDao.selectUpIdsByReplenishErAndReplenishEquAndStateList(replenishEr,deviceId);
    }
    /**
     * 查询备货单未完成
     * @param replenishEr
     * @param deviceId
     * @return
     * @throws Exception
     */
    public List<Mediicinestockup> queryUpListByDeviceIdAndStatus(String replenishEr,String deviceId) throws Exception {
        return upDao.selectUpIdsByReplenishErAndReplenishEquAndStatusList(replenishEr,deviceId);
    }
    /**
     * 更新备货单、导入1，完成 2
     * @param id
     * @param status
     * @return
     * @throws Exception
     */
    public Mediicinestockup updateStockUpStatus(String id,Integer status) throws Exception {
        Mediicinestockup mediicinestockup = upDao.findOne(id);
        mediicinestockup.setStatus(status);
        mediicinestockup.setUpdateTime(new Date());
        return upDao.save(mediicinestockup);
    }
    //订单明细