Merge remote-tracking branch 'remotes/origin/yufei' into master
# Conflicts:
# src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
| | |
| | | */ |
| | | private LazyDataModel<OpeReagentStatus> dataModel; |
| | | private String reagentId; |
| | | private String reagentName; |
| | | private String reagentCode; |
| | | private String applyPerson; |
| | | private Date startTime; |
| | |
| | | Map<String, Object> filters) { |
| | | List<OpeUseFlow> list = null; |
| | | try { |
| | | int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project); |
| | | int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project,applyPerson,reagentName); |
| | | this.setRowCount(count); |
| | | if (count > 0) { |
| | | list = opeUseFlowService.getPersonalUseInfoList |
| | | (reagentCode, getUserId(),startTime,endTime ,receiptNumber,department,project,first,pageSize); |
| | | (reagentCode, getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize); |
| | | } |
| | | } catch (Exception e) { |
| | | logger.error(e); |
| | |
| | | public void setPrintTable(Hashtable printTable) { |
| | | this.printTable = printTable; |
| | | } |
| | | |
| | | public String getReagentName() { |
| | | return reagentName; |
| | | } |
| | | |
| | | public void setReagentName(String reagentName) { |
| | | this.reagentName = reagentName; |
| | | } |
| | | } |
| | |
| | | private String warehouseName; |
| | | |
| | | private Integer editFlag; |
| | | private Integer isAllApply = 0; |
| | | private StreamedContent file; |
| | | @Value("${pdf.export.file.path}") |
| | | private String pdfExportFilePath; |
| | |
| | | this.opeWarehouseReserveService.reagentDStore3(opeList,userId); |
| | | |
| | | //扣库存 |
| | | opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId); |
| | | opeWarehouseReserveService.btWarehouseReserveReduce(list2); |
| | | } |
| | | |
| | | for(int i=0;i<list2.size();i++){ |
| | |
| | | |
| | | } |
| | | |
| | | /** |
| | | * 点击打印 关联所有流向和领用单号e |
| | | */ |
| | | |
| | | |
| | | public void associatedFlowReceiptNumber2() { |
| | | try { |
| | | opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber); |
| | | //弹出打印窗口 |
| | | RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()"); |
| | | } catch (Exception e) { |
| | | logger.info(e.getMessage()); |
| | | } |
| | | |
| | | } |
| | | |
| | | |
| | | public void closeDialog() { |
| | | try { |
| | | opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber); |
| | | onCancelBtnClick(); |
| | | } catch (Exception e) { |
| | | logger.info(e.getMessage()); |
| | | } |
| | | |
| | | } |
| | | |
| | | public void closeDialog2() { |
| | | try { |
| | | opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber); |
| | | onCancelBtnClick(); |
| | | } catch (Exception e) { |
| | | logger.info(e.getMessage()); |
| | | } |
| | |
| | | opeUseFlow.setHouseId(list2.get(i).getWarehouseId()); |
| | | opeUseFlow.setContainerId(warehouseReserveInfo.get(0).getContainerId()); |
| | | opeUseFlow.setCreateTime(warehouseReserveInfo.get(0).getUpdateTime()); |
| | | opeUseFlow.setUserId(userId); |
| | | opeUseFlow.setUserId(warehouseReserveInfo.get(0).getUserId()); |
| | | opeUseFlow.setRemainder(list2.get(i).getReagent().getMainMetering()!=null?list2.get(i).getReagent().getMainMetering():new BigDecimal(0)); |
| | | opeUseFlow.setStoreType(StoreType.DIRECTSTORE); |
| | | |
| | |
| | | } |
| | | |
| | | try { |
| | | int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id,reagentId, userName,productSn,applyCode,status); |
| | | int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply); |
| | | this.setRowCount(count); |
| | | if (count > 0) { |
| | | list = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, first, |
| | | pageSize,productSn,applyCode,status); |
| | | pageSize, productSn, applyCode, status, isAllApply); |
| | | } |
| | | } catch (Exception e) { |
| | | logger.error(e); |
| | |
| | | realDataList=selectedListForPerson; |
| | | }else { |
| | | realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null, |
| | | null,productSn,applyCode,status); |
| | | null,productSn,applyCode,status,isAllApply); |
| | | } |
| | | List<String> headerList = new ArrayList<>(); |
| | | headerList.add("申购编号"); |
| | |
| | | public void setWarehouseName(String warehouseName) { |
| | | this.warehouseName = warehouseName; |
| | | } |
| | | |
| | | public Integer getIsAllApply() { |
| | | return isAllApply; |
| | | } |
| | | |
| | | public void setIsAllApply(Integer isAllApply) { |
| | | this.isAllApply = isAllApply; |
| | | } |
| | | } |
| | |
| | | LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id |
| | | where oa.valid_flag = 1 and (oa.status=4 or oa.status=6) |
| | | <include refid="getOpeApplyReserveList_queryWhereSql" /> |
| | | <if test="isAllApply != null"> |
| | | <choose> |
| | | <when test="isAllApply == 1"> |
| | | and oa.used = oa.num |
| | | </when> |
| | | <otherwise> |
| | | and oa.used != oa.num |
| | | </otherwise> |
| | | </choose> |
| | | </if> |
| | | GROUP BY oa.id |
| | | )as oaa |
| | | </select> |
| | |
| | | LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id |
| | | where oa.valid_flag = 1 and (oa.status=4 or oa.status=6) |
| | | <include refid="getOpeApplyReserveList_queryWhereSql" /> |
| | | <if test="isAllApply != null"> |
| | | <choose> |
| | | <when test="isAllApply == 1"> |
| | | and oa.used = oa.num |
| | | </when> |
| | | <otherwise> |
| | | and oa.used != oa.num |
| | | </otherwise> |
| | | </choose> |
| | | </if> |
| | | GROUP BY oa.id |
| | | order by oa.update_time desc |
| | | <if test="first != null and pageSize != null"> |
| | |
| | | List<OpeUseFlow> selectPersonalUseInfo(Map params); |
| | | |
| | | List<PersonUseDetail> getApplyInfo(Map params); |
| | | |
| | | int getApplyInfoSize(Map params); |
| | | } |
| | |
| | | <if test="receiptNumber !=null and receiptNumber != ''"> |
| | | and ouf.receipt_number like concat("%",#{receiptNumber},"%") |
| | | </if> |
| | | <if test="reagentName !=null and reagentName != ''"> |
| | | and sr.name like concat("%",#{reagentName},"%") |
| | | </if> |
| | | <if test="applyPerson !=null and applyPerson != ''"> |
| | | and su.name like concat("%",#{applyPerson},"%") |
| | | </if> |
| | | group by ouf.receipt_number) a |
| | | |
| | | |
| | |
| | | <if test="receiptNumber !=null and receiptNumber != ''"> |
| | | and ouf.receipt_number like concat("%",#{receiptNumber},"%") |
| | | </if> |
| | | <if test="reagentName !=null and reagentName != ''"> |
| | | and sr.name like concat("%",#{reagentName},"%") |
| | | </if> |
| | | <if test="applyPerson !=null and applyPerson != ''"> |
| | | and su.name like concat("%",#{applyPerson},"%") |
| | | </if> |
| | | group by ouf.receipt_number |
| | | ORDER BY ouf.create_time desc |
| | | <if test="first != null and pageSize != null"> |
| | |
| | | and ouf.receipt_number = #{receiptNumber} |
| | | </select> |
| | | |
| | | |
| | | <select id="getApplyInfoSize" resultType="java.lang.Integer"> |
| | | SELECT |
| | | count(0) |
| | | from `ope_use_flow` ouf |
| | | LEFT JOIN ope_reagent_status ors ON ors.reagent_code = ouf.reagent_code |
| | | LEFT join sys_reagent sr ON ors.reagent_id = sr.id |
| | | LEFT JOIN base_meta bm ON bm.id = sr.reagent_format |
| | | LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit |
| | | LEFT JOIN base_meta bm2 on bm2.id = sr.product_home |
| | | LEFT JOIN base_meta bm3 on bm3.id = sr.control_products |
| | | WHERE ouf.operatestate = #{operatestate} |
| | | and ouf.receipt_number = #{receiptNumber} |
| | | </select> |
| | | |
| | | <insert id="insertOpeUseFlow" parameterType="com.nanometer.smartlab.entity.OpeUseFlow"> |
| | | insert into ope_use_flow(id, reagent_code, status, house_id, container_id, user_id, remainder, place, store_type, valid_flag, create_time, realstatus, operatestate) |
| | | values (#{id}, #{reagentCode}, #{status}, #{houseId}, #{containerId}, #{userId}, #{remainder}, #{place}, #{storeType}, 1, #{createTime}, #{realstatus},#{operateState}) |
| | |
| | | <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result> |
| | | |
| | | <result property="reagentId" column="reagent_id"></result> |
| | | <result property="userId" column="user_id"></result> |
| | | <association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent"> |
| | | <id property="id" column="reagentId"/> |
| | | <result property="name" column="name"></result> |
| | |
| | | </select> |
| | | |
| | | <insert id="insertOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve"> |
| | | insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id) |
| | | values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId}) |
| | | insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id,user_id) |
| | | values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId},#{userId}) |
| | | </insert> |
| | | <insert id="insertOpeWarehouseReserve2" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve"> |
| | | insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id) |
| | | values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId}) |
| | | insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id,user_id) |
| | | values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId},#{userId}) |
| | | </insert> |
| | | |
| | | <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve"> |
| | |
| | | </if> |
| | | <if test="containerId != null and containerId !=''"> |
| | | container_id=#{containerId}, |
| | | </if> |
| | | <if test="userId != null and userId !=''"> |
| | | user_id=#{userId}, |
| | | </if> |
| | | </set> |
| | | where id=#{id} |
| | |
| | | owr.reserve, |
| | | owr.article_number, |
| | | owr.container_id, |
| | | owr.user_id, |
| | | owr.update_time |
| | | FROM |
| | | ope_warehouse_reserve owr |
| | |
| | | private String orderCode; |
| | | //新增 货柜id |
| | | private String containerId; |
| | | private String userId; |
| | | |
| | | |
| | | /** |
| | |
| | | public void setContainerId(String containerId) { |
| | | this.containerId = containerId; |
| | | } |
| | | |
| | | public String getUserId() { |
| | | return userId; |
| | | } |
| | | |
| | | public void setUserId(String userId) { |
| | | this.userId = userId; |
| | | } |
| | | } |
| | |
| | | int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName); |
| | | List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first, |
| | | Integer pageSize); |
| | | int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status); |
| | | int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply); |
| | | List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first, |
| | | Integer pageSize,String productSn,String applyCode,Integer status); |
| | | Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply); |
| | | public boolean updaetOpeApplyPrice(BigDecimal applyPrice,String id); |
| | | public boolean updaetOpeApplyStockFlag(int stockFlag,String id); |
| | | public boolean cancelApply(ApplyStatus status,String id); |
| | |
| | | } |
| | | |
| | | @Override |
| | | public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) { |
| | | public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) { |
| | | try { |
| | | Map<String, Object> params = new HashMap<String, Object>(); |
| | | params.put("reagentName", reagentName); |
| | |
| | | params.put("productSn",productSn); |
| | | params.put("applyCode",applyCode); |
| | | params.put("status",status); |
| | | params.put("isAllApply",isAllApply); |
| | | return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params); |
| | | } catch (DataAccessException e) { |
| | | logger.error(e.getMessage(), e); |
| | |
| | | } |
| | | @Override |
| | | public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first, |
| | | Integer pageSize,String productSn,String applyCode,Integer status) { |
| | | Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) { |
| | | try { |
| | | Map<String, Object> params = new HashMap<String, Object>(); |
| | | params.put("reagentName", reagentName); |
| | |
| | | params.put("productSn",productSn); |
| | | params.put("applyCode",applyCode); |
| | | params.put("status",status); |
| | | params.put("isAllApply",isAllApply); |
| | | return this.opeApplyDao.getOpeApplyReserveListFor(params); |
| | | } catch (DataAccessException e) { |
| | | logger.error(e.getMessage(), e); |
| | |
| | | if (codeList == null){ |
| | | //无条码入库 不需要增加状态和流向 |
| | | //1.1库存表增加 |
| | | opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo); |
| | | opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId); |
| | | }else{ |
| | | //条码入库 |
| | | assert codeList.size() > 0; |
| | | //1.1入库(库存表增加) |
| | | opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo); |
| | | opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId); |
| | | //1.2试剂状态表增加,流向增加 |
| | | opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo); |
| | | } |
| | |
| | | |
| | | void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber); |
| | | |
| | | int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project); |
| | | int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName); |
| | | |
| | | List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize); |
| | | List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize); |
| | | |
| | | List<PersonUseDetail> getApplyInfo(String receiptNumber); |
| | | |
| | | int getApplyInfoSize(String receiptNumber); |
| | | |
| | | } |
| | |
| | | } |
| | | |
| | | @Override |
| | | public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project) { |
| | | public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, |
| | | String department, String project,String applyPerson,String reagentName) { |
| | | Map<String,Object> params = new HashMap<>(); |
| | | params.put("userId", userId); |
| | | params.put("startTime", startTime); |
| | |
| | | params.put("department", department); |
| | | params.put("project", project); |
| | | params.put("reagentCode", reagentCode); |
| | | params.put("applyPerson", applyPerson); |
| | | if (StringUtils.isNotBlank(reagentName)) { |
| | | //根据试剂名获取单号 |
| | | |
| | | } |
| | | params.put("reagentName", reagentName); |
| | | //操作状态位仓库领取 |
| | | Map<String, String> metaMap2 = new HashMap<>(); |
| | | metaMap2.put("groupId", "operate_status"); |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize) { |
| | | public List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, |
| | | String department, String project,String applyPerson,String reagentName, int first, int pageSize) { |
| | | Map<String, Object> params = new HashMap<>(); |
| | | params.put("userId", userId); |
| | | params.put("startTime", startTime); |
| | |
| | | params.put("department", department); |
| | | params.put("project", project); |
| | | params.put("reagentCode", reagentCode); |
| | | params.put("applyPerson", applyPerson); |
| | | params.put("reagentName", reagentName); |
| | | //操作状态位仓库领取 |
| | | Map<String, String> metaMap2 = new HashMap<>(); |
| | | metaMap2.put("groupId", "operate_status"); |
| | |
| | | } |
| | | |
| | | |
| | | @Override |
| | | public int getApplyInfoSize(String receiptNumber) { |
| | | Map<String,Object> params = new HashMap<>(); |
| | | Map<String, String> metaMap2 = new HashMap<>(); |
| | | metaMap2.put("groupId", "operate_status"); |
| | | metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey())); |
| | | List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2); |
| | | params.put("operatestate", baseMetas.get(0).getId()); |
| | | params.put("receiptNumber", receiptNumber); |
| | | |
| | | return opeUseFlowDao.getApplyInfoSize(params); |
| | | |
| | | } |
| | | |
| | | } |
| | |
| | | public List<OpeWarehouseReserve> selectByReId(String id); |
| | | public void updateByReId(String newReId,String oldReId); |
| | | |
| | | void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo); |
| | | void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId); |
| | | |
| | | List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag); |
| | | |
| | | void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId); |
| | | void btWarehouseReserveReduce(List<OpeApplyReserve> opeList); |
| | | |
| | | List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId); |
| | | |
| | |
| | | |
| | | @Override |
| | | @Transactional |
| | | public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo) { |
| | | public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId) { |
| | | |
| | | OpeWarehouseReserve ope = this.getOpeWarehouseReserve2(opeApplyReserve.getReagent().getId(), opeApplyReserve.getArticleNumber(),opeApplyReserve.getHouseId()); |
| | | if (ope == null) { |
| | |
| | | //批号 |
| | | ope.setArticleNumber(opeApplyReserve.getArticleNumber()); |
| | | ope.setId(IDUtils.uuid()); |
| | | //新增收货人 保存在仓库库存表 |
| | | ope.setUserId(consigneeId); |
| | | opeWarehouseReserveDao.insertOpeWarehouseReserve2(ope); |
| | | }else { |
| | | ope.setReserve(ope.getReserve() + opeApplyReserve.getArrivalNum()); |
| | |
| | | } |
| | | |
| | | @Override |
| | | public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId) { |
| | | public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) { |
| | | if (opeList.size() < 1) { |
| | | return; |
| | | } |
| | |
| | | OpeUseFlow opeUseFlow = new OpeUseFlow(); |
| | | opeUseFlow.setReagentCode(reagentCodes.get(0)); |
| | | opeUseFlow.setStatus(ArrivalStatus.WAREHOUSE); |
| | | opeUseFlow.setUserId(userId); |
| | | opeUseFlow.setUserId(warehouseReserve.getUserId()); |
| | | //仓库地点 |
| | | opeUseFlow.setHouseId(warehouseReserve.getWarehouseId()); |
| | | opeUseFlow.setContainerId(warehouseReserve.getContainerId()); |
| | |
| | | opeWarehouseReserve.setReserve(0); |
| | | opeWarehouseReserve.setWarehouseId(opeApply.getHouseId()); |
| | | opeWarehouseReserve.setContainerId(opeApply.getContainerId()); |
| | | opeWarehouseReserve.setUserId(loginUserId); |
| | | } |
| | | opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + opeApply.getArrivalNum()); |
| | | if (StringUtils.isBlank(opeWarehouseReserve.getId())) { |
| | |
| | | opeWarehouseReserve.setArticleNumber(inWarehouseInfo.getArticleNumber()); |
| | | opeWarehouseReserve.setReserve(0); |
| | | opeWarehouseReserve.setWarehouseId(inWarehouseInfo.getWarehouseId()); |
| | | opeWarehouseReserve.setUserId("admin"); |
| | | } |
| | | //库存加1 |
| | | opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + 1); |
| | |
| | | emptyMessage="无数据" selection="#{approvalMngController.selectedList}" |
| | | rows="20" pageLinks="5"> |
| | | <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/> |
| | | <p:column headerText="订单状态" width="58px;" style="text-align: center"> |
| | | <p:column headerText="订单状态" width="60px;" style="text-align: center"> |
| | | <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText> |
| | | </p:column> |
| | | <p:column headerText="申购编号" width="118px;"> |
| | |
| | | <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText> |
| | | </p:column> |
| | | |
| | | <p:column headerText="含税售价" width="56px;"> |
| | | <p:column headerText="含税售价" width="60px;"> |
| | | <h:outputText value="#{row.applyPrice}"></h:outputText> |
| | | </p:column> |
| | | |
| | |
| | | <!--<h:outputText value="#{row.reagent!=null?row.reagent.supplierName:''}"></h:outputText>--> |
| | | <!--</p:column>--> |
| | | |
| | | <p:column headerText="试剂类型" width="29px;"> |
| | | <p:column headerText="试剂类型" width="60px;"> |
| | | <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText> |
| | | </p:column> |
| | | |
| | |
| | | } |
| | | </style> |
| | | <p:panel styleClass="center-header"> |
| | | <p:panelGrid styleClass="filter" columns="13"> |
| | | <p:panelGrid styleClass="filter" columns="10"> |
| | | |
| | | <p:outputLabel value="单据编号:"/> |
| | | <p:inputText value="#{personalUseInfoController.receiptNumber}"/> |
| | | |
| | | <p:outputLabel value="试剂名称:"/> |
| | | <p:inputText value="#{personalUseInfoController.reagentName}"/> |
| | | |
| | | <p:outputLabel value="申领人:"/> |
| | | <p:inputText value="#{personalUseInfoController.applyPerson}"/> |
| | | |
| | | <p:outputLabel value="课题组:"/> |
| | | <p:inputText value="#{personalUseInfoController.project}"/> |
| | |
| | | selectionMode="single" |
| | | emptyMessage="无数据" |
| | | selection="#{personalUseInfoController.selectOne}" |
| | | rows="20" pageLinks="5"> |
| | | rows="10" pageLinks="5"> |
| | | |
| | | <!-- <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>--> |
| | | <p:column headerText="单据编号"> |
| | |
| | | </p:column> |
| | | |
| | | <p:column headerText="领用数量" width="50"> |
| | | <h:outputText value="#{row.applyNum}"/> |
| | | <h:outputText value="#{personalUseInfoController.reagentName eq null |
| | | or personalUseInfoController.reagentName eq ''?row.applyNum:OpeUseFlowService.getApplyInfoSize(row.getReceiptNumber())}"/> |
| | | </p:column> |
| | | |
| | | <p:column headerText="课题组"> |
| | |
| | | <p:commandButton value="关闭" |
| | | process="@this" |
| | | styleClass="yes-btn" |
| | | actionListener="#{warehouseStockMngController.onCancelBtnClick}" |
| | | actionListener="#{warehouseStockMngController.closeDialog2}" |
| | | style="position: relative;left: 20px;" |
| | | update=":centerRootPanel" |
| | | oncomplete="PF('printDialog').hide()"> |
| | |
| | | <p:commandButton value="关闭" |
| | | process="@this" |
| | | styleClass="yes-btn" |
| | | actionListener="#{warehouseStockMngController.onCancelBtnClick}" |
| | | actionListener="#{warehouseStockMngController.closeDialog}" |
| | | style="position: relative;left: 20px;" |
| | | update=":centerRootPanel" |
| | | oncomplete="PF('printDialog').hide()"> |
| | |
| | | </div> |
| | | <h:form id="warehouseStockMngFormForPerson"> |
| | | <p:panel styleClass="center-header" style="border-bottom:none;"> |
| | | <p:panelGrid styleClass="filter" columns="12"> |
| | | <p:panelGrid styleClass="filter" columns="14"> |
| | | <style type="text/css"> |
| | | .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{ |
| | | min-width: 60px !important; |
| | | } |
| | | .ui-selectonemenu-items.ui-selectonemenu-list.ui-widget-content.ui-widget.ui-corner-all.ui-helper-reset{ |
| | | width: 77px !important; |
| | | } |
| | | </style> |
| | | |
| | | <p:outputLabel value="试剂名称:"></p:outputLabel> |
| | | <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText> |
| | |
| | | <p:outputLabel value="产品编号:"></p:outputLabel> |
| | | <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText> |
| | | <p:outputLabel value="状态:"></p:outputLabel> |
| | | <p:selectOneMenu value="#{warehouseStockMngController.status}"> |
| | | <p:selectOneMenu value="#{warehouseStockMngController.status}" style="width: 60px;"> |
| | | <f:selectItem itemLabel="全部" noSelectionOption="true"></f:selectItem> |
| | | <f:selectItems value="#{warehouseStockMngController.statusSelectList}" var="item" |
| | | itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems> |
| | | </p:selectOneMenu> |
| | | |
| | | <p:outputLabel value="已领用:"></p:outputLabel> |
| | | <p:selectOneMenu value="#{warehouseStockMngController.isAllApply}" style="width: 60px;"> |
| | | <f:selectItem itemLabel="否" itemValue="0"/> |
| | | <f:selectItem itemLabel="是" itemValue="1"/> |
| | | <f:selectItem itemLabel="全部" noSelectionOption="true"/> |
| | | </p:selectOneMenu> |
| | | |
| | | <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink> |
| | | </p:panelGrid> |
| | | </p:panel> |