16 changed files with 1466 additions and 9 deletions
@ -0,0 +1,111 @@ |
|||
package org.nl.b_lms.storage_manage.md.dao; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableId; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import lombok.Builder; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.io.Serializable; |
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* @author zhouz |
|||
* @description / |
|||
* @date 2021-12-07 |
|||
**/ |
|||
@Data |
|||
@Builder |
|||
@EqualsAndHashCode(callSuper = false) |
|||
@TableName("md_me_materialbase") |
|||
|
|||
public class MdMeMaterialBase implements Serializable { |
|||
|
|||
/** |
|||
* 防止精度丢失 |
|||
*/ |
|||
@TableId |
|||
private Long material_id; |
|||
|
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String material_code; |
|||
|
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String material_name; |
|||
|
|||
private String material_spec; |
|||
|
|||
private String material_model; |
|||
|
|||
private String english_name; |
|||
|
|||
private long base_unit_id; |
|||
|
|||
private long assist_unit_id; |
|||
private String base_unit_name; |
|||
|
|||
private String approve_fileno; |
|||
|
|||
private String print_no; |
|||
|
|||
/** |
|||
* 物料分类 |
|||
*/ |
|||
private Long material_type_id; |
|||
|
|||
private Long len_unit_id; |
|||
|
|||
private BigDecimal length; |
|||
|
|||
private BigDecimal width; |
|||
|
|||
private BigDecimal height; |
|||
|
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private Long weight_unit_id; |
|||
|
|||
private BigDecimal gross_weight; |
|||
|
|||
private BigDecimal net_weight; |
|||
|
|||
private Long cubage_unit_id; |
|||
|
|||
private BigDecimal cubage; |
|||
|
|||
private String create_id; |
|||
|
|||
private String create_name; |
|||
|
|||
private String create_time; |
|||
|
|||
private String update_optid; |
|||
|
|||
private String update_optname; |
|||
|
|||
private String update_time; |
|||
|
|||
private String is_used_time; |
|||
|
|||
/** |
|||
* 是否启用 |
|||
*/ |
|||
private String is_used; |
|||
|
|||
private String is_delete; |
|||
|
|||
private String ext_id; |
|||
|
|||
private String material_height_type; |
|||
|
|||
private Long ass_unit_id; |
|||
|
|||
private Long product_series; |
|||
|
|||
private Integer standing_time; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package org.nl.b_lms.storage_manage.md.dao.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; |
|||
import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase; |
|||
|
|||
/** |
|||
* <p> |
|||
* 物料基本信息表表 Mapper 接口 |
|||
* </p> |
|||
* |
|||
* @author generator |
|||
* @since 2023-11-16 |
|||
*/ |
|||
public interface MdMeMaterialBaseMapper extends BaseMapper<MdMeMaterialBase> { |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,8 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper"> |
|||
|
|||
|
|||
|
|||
|
|||
</mapper> |
|||
@ -1,12 +1,12 @@ |
|||
package org.nl.wms.basedata.master.rest; |
|||
package org.nl.b_lms.storage_manage.md.rest; |
|||
|
|||
|
|||
import cn.hutool.core.map.MapUtil; |
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.b_lms.storage_manage.md.service.MaterialbaseService; |
|||
import org.nl.modules.logging.annotation.Log; |
|||
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; |
|||
import org.nl.wms.basedata.master.service.MaterialbaseService; |
|||
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; |
|||
import org.springframework.data.domain.Pageable; |
|||
import org.springframework.http.HttpStatus; |
|||
@ -1,4 +1,4 @@ |
|||
package org.nl.wms.basedata.master.service; |
|||
package org.nl.b_lms.storage_manage.md.service; |
|||
|
|||
import com.alibaba.fastjson.JSONArray; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
@ -0,0 +1,73 @@ |
|||
package org.nl.wms.st.inbill.rest; |
|||
|
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.modules.logging.annotation.Log; |
|||
import org.nl.wms.st.inbill.service.RawAssistIStorService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.data.domain.Pageable; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.Map; |
|||
|
|||
@RestController |
|||
@RequiredArgsConstructor |
|||
|
|||
@RequestMapping("/api/in/rawAssist") |
|||
@Slf4j |
|||
public class RawAssistIStorController { |
|||
|
|||
@Autowired |
|||
private RawAssistIStorService rawAssistIStorService; |
|||
|
|||
@GetMapping |
|||
@Log("查询入库单据") |
|||
|
|||
//@PreAuthorize("@el.check('checkoutbill:list')")
|
|||
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) { |
|||
return new ResponseEntity<>(rawAssistIStorService.pageQuery(whereJson, page), HttpStatus.OK); |
|||
} |
|||
|
|||
@Log("删除出入库单") |
|||
|
|||
//@PreAuthorize("@el.check('sectattr:del')")
|
|||
@DeleteMapping |
|||
public ResponseEntity<Object> delete(@RequestBody Long[] ids) { |
|||
rawAssistIStorService.deleteAll(ids); |
|||
return new ResponseEntity<>(HttpStatus.OK); |
|||
} |
|||
|
|||
@GetMapping("/getBillDtl") |
|||
@Log("查询入库单来源") |
|||
|
|||
//@PreAuthorize("@el.check('materialtype:list')")
|
|||
public ResponseEntity<Object> getBillDtl(@RequestParam Map whereJson, Pageable page) { |
|||
return new ResponseEntity<>(rawAssistIStorService.getBillDtl(whereJson, page), HttpStatus.OK); |
|||
} |
|||
|
|||
|
|||
|
|||
@PutMapping |
|||
@Log("修改入库单") |
|||
|
|||
//@PreAuthorize("@el.check('sectattr:edit')")
|
|||
public ResponseEntity<Object> update(@RequestBody Map whereJson) { |
|||
rawAssistIStorService.update(whereJson); |
|||
return new ResponseEntity<>(HttpStatus.NO_CONTENT); |
|||
} |
|||
|
|||
|
|||
@PostMapping("/divStruct") |
|||
@Log("分配货位") |
|||
|
|||
//@PreAuthorize("@el.check('materialtype:list')")
|
|||
public ResponseEntity<Object> divStruct(@RequestBody Map whereJson) { |
|||
rawAssistIStorService.divStruct(whereJson); |
|||
return new ResponseEntity<>(HttpStatus.NO_CONTENT); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package org.nl.wms.st.inbill.service; |
|||
|
|||
import com.alibaba.fastjson.JSONObject; |
|||
import org.springframework.data.domain.Pageable; |
|||
|
|||
import java.util.Map; |
|||
|
|||
public interface RawAssistIStorService { |
|||
/** |
|||
* 查询数据分页 |
|||
* |
|||
* @param whereJson 条件 |
|||
* @param page 分页参数 |
|||
* @return Map<String, Object> |
|||
*/ |
|||
Map<String, Object> pageQuery(Map whereJson, Pageable page); |
|||
|
|||
Map<String, Object> getBillDtl(Map whereJson, Pageable page); |
|||
|
|||
|
|||
void deleteAll(Long[] ids); |
|||
|
|||
void update(Map whereJson); |
|||
|
|||
void divStruct(Map whereJson); |
|||
|
|||
|
|||
JSONObject autoDis(JSONObject whereJson); |
|||
} |
|||
File diff suppressed because it is too large
Loading…
Reference in new issue