| | |
| | | import com.zy.asrs.entity.AdjDetl; |
| | | import com.zy.asrs.service.AdjDetlService; |
| | | import com.zy.common.web.BaseController; |
| | | import com.zy.system.entity.SaasLog; |
| | | import com.zy.system.service.SaasLogService; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | |
| | | |
| | | @Autowired |
| | | private AdjDetlService adjDetlService; |
| | | |
| | | @Autowired |
| | | private SaasLogService saasLogService; |
| | | |
| | | @RequestMapping(value = "/adjDetl/{id}/auth") |
| | | @ManagerAuth |
| | |
| | | @RequestParam(required = false)String orderByType, |
| | | @RequestParam(required = false)String condition, |
| | | @RequestParam Map<String, Object> param){ |
| | | //以前是立库库存调整接口,后改为平库调整接口 |
| | | excludeTrash(param); |
| | | EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>(); |
| | | EntityWrapper<SaasLog> wrapper = new EntityWrapper<>(); |
| | | convert(param, wrapper); |
| | | allLike(AdjDetl.class, param.keySet(), wrapper, condition); |
| | | wrapper.eq("type",2); |
| | | allLike(SaasLog.class, param.keySet(), wrapper, condition); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | | private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ |
| | |
| | | } |
| | | ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>() |
| | | .eq("loc_no", targetNode.getUuid()) |
| | | .eq("matnr", source.getMatnr())); |
| | | .eq("matnr", source.getMatnr()) |
| | | .eq("batch",source.getBatch())); |
| | | if (check == null) { |
| | | manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo()) |
| | | .eq("matnr", source.getMatnr())); |
| | | .eq("matnr", source.getMatnr()).eq("batch",source.getBatch())); |
| | | source.setLocNo(targetNode.getUuid()); |
| | | source.setNodeId(targetNode.getId()); |
| | | |
| | |
| | | <select id="queryViewInOutList" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean"> |
| | | select * from ( |
| | | select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid |
| | | from asr_sta_inout_view |
| | | from man_loc_InOut_view |
| | | <where> |
| | | 1=1 |
| | | <include refid="viewInOutConditionSql"></include> |
| | |
| | | </select> |
| | | |
| | | <select id="getViewInOutCount" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer"> |
| | | select count(1) from asr_sta_inout_view a |
| | | select count(1) from man_loc_InOut_view a |
| | | <where> |
| | | <![CDATA[ |
| | | 1=1 |
| | |
| | | // {field: 'adjId', align: 'center',title: '序号'} |
| | | {field: 'locNo', align: 'center',title: '库位号'} |
| | | ,{field: 'matnr', align: 'center',title: '商品编号'} |
| | | ,{field: 'batch', align: 'center',title: '批号'} |
| | | // ,{field: 'batch', align: 'center',title: '批号'} |
| | | // ,{field: 'oriCtns', align: 'center',title: '原箱数'} |
| | | ,{field: 'oriQty', align: 'center',title: '原数量'} |
| | | //,{field: 'oriQty', align: 'center',title: '原数量'} |
| | | // ,{field: 'oriWt', align: 'center',title: '原重量'} |
| | | // ,{field: 'adjCtns', align: 'center',title: '变更箱数'} |
| | | ,{field: 'adjQty', align: 'center',title: '变更数量'} |
| | | ,{field: 'anfme', align: 'center',title: '变更数量'} |
| | | // ,{field: 'adjWt', align: 'center',title: '变更重量'} |
| | | ,{field: 'memo', align: 'center',title: '备注',hide:true} |
| | | ,{field: 'modiUser$', align: 'center',title: '修改人员'} |
| | | ,{field: 'modiTime$', align: 'center',title: '修改时间'} |
| | | ,{field: 'type$', align: 'center',title: '类型'} |
| | | ,{field: 'createByName', align: 'center',title: '修改人员'} |
| | | ,{field: 'ioTime$', align: 'center',title: '修改时间'} |
| | | // ,{field: 'appeUser', align: 'center',title: '创建者'} |
| | | // ,{field: 'appeTime$', align: 'center',title: '添加时间'} |
| | | |
| | |
| | | cols: [[ |
| | | // {type: 'checkbox'} |
| | | {field: 'ymd', align: 'center', title: '日期'} |
| | | ,{field: 'source_sta_no', align: 'center',title: '站点'} |
| | | |
| | | ,{field: 'sto_qty', align: 'center',title: '入库次数'} |
| | | ,{field: 'ret_qty', align: 'center',title: '出库次数'} |
| | | ,{field: 'total_qty', align: 'center',title: '入出总数'} |