root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
18188916393
2022-09-27 11:47:57 +08:00
parent bfe900c66f
commit d1e772cda5
4 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java
View File

@@ -34,16 +34,16 @@ public class CribbinginfoDto implements Serializable {
private String product_code; private String product_code;
/** A长边 */ /** A长边 */
private String AlongSide; private String alongside;
/** B短边 */ /** B短边 */
private String BshortSide; private String bshortside;
/** H梯形高 */ /** H梯形高 */
private String Htrapezoidal; private String htrapezoidal;
/** W厚度 */ /** W厚度 */
private String Wthickness; private String wthickness;
/** 当前垛盘数 */ /** 当前垛盘数 */
private String tray_qty; private String tray_qty;

45
wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java
View File

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -25,47 +26,47 @@ import lombok.extern.slf4j.Slf4j;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
/** /**
* @description 服务实现 * @author qinx
* @author qinx * @description 服务实现
* @date 2022-09-26 * @date 2022-09-26
**/ **/
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class CribbinginfoServiceImpl implements CribbinginfoService { public class CribbinginfoServiceImpl implements CribbinginfoService {
@Override @Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){ public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
final JSONObject json = rb.pageResult(); final JSONObject json = rb.pageResult();
return json; return json;
} }
@Override @Override
public List<CribbinginfoDto> queryAll(Map whereJson){ public List<CribbinginfoDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
JSONArray arr = wo.query().getResultJSONArray(0); JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class); if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class);
return null; return null;
} }
@Override @Override
public CribbinginfoDto findById(Long info_id) { public CribbinginfoDto findById(Long info_id) {
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
JSONObject json = wo.query("info_id = '" + info_id + "'").uniqueResult(0); JSONObject json = wo.query("info_id = '" + info_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){ if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject( CribbinginfoDto.class); return json.toJavaObject(CribbinginfoDto.class);
} }
return null; return null;
} }
@Override @Override
public CribbinginfoDto findByCode(String code) { public CribbinginfoDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){ if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject( CribbinginfoDto.class); return json.toJavaObject(CribbinginfoDto.class);
} }
return null; return null;
} }
@@ -87,6 +88,10 @@ public class CribbinginfoServiceImpl implements CribbinginfoService {
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto));
/*json.put("alongSide", dto.getAlongSide());
json.put("BshortSide", dto.getBshortSide());
json.put("Htrapezoidal", dto.getHtrapezoidal());
json.put("Wthickness", dto.getWthickness());*/
wo.insert(json); wo.insert(json);
} }
@@ -117,5 +122,5 @@ public class CribbinginfoServiceImpl implements CribbinginfoService {
wo.delete("info_id = '" + info_id + "'"); wo.delete("info_id = '" + info_id + "'");
} }
} }
} }

BIN
wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.

18
wms/qd/src/views/wms/Cribbing/index.vue
View File

@@ -20,16 +20,16 @@
<el-input v-model="form.product_code" style="width: 370px;" /> <el-input v-model="form.product_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="A长边"> <el-form-item label="A长边">
<el-input v-model="form.AlongSide" style="width: 370px;" /> <el-input v-model="form.alongside" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="B短边"> <el-form-item label="B短边">
<el-input v-model="form.BshortSide" style="width: 370px;" /> <el-input v-model="form.bshortside" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="H梯形高"> <el-form-item label="H梯形高">
<el-input v-model="form.Htrapezoidal" style="width: 370px;" /> <el-input v-model="form.htrapezoidal" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="W厚度"> <el-form-item label="W厚度">
<el-input v-model="form.Wthickness" style="width: 370px;" /> <el-input v-model="form.wthickness" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="当前垛盘数"> <el-form-item label="当前垛盘数">
<el-input v-model="form.tray_qty" style="width: 370px;" /> <el-input v-model="form.tray_qty" style="width: 370px;" />
@@ -204,10 +204,10 @@
<el-table-column prop="material_code" label="物料编码" /> <el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称 " /> <el-table-column prop="material_name" label="物料名称 " />
<el-table-column prop="product_code" label="产品编号" /> <el-table-column prop="product_code" label="产品编号" />
<el-table-column prop="AlongSide" label="A长边" /> <el-table-column prop="alongside" label="A长边" />
<el-table-column prop="BshortSide" label="B短边" /> <el-table-column prop="bshortside" label="B短边" />
<el-table-column prop="Htrapezoidal" label="H梯形高" /> <el-table-column prop="htrapezoidal" label="H梯形高" />
<el-table-column prop="Wthickness" label="W厚度" /> <el-table-column prop="wthickness" label="W厚度" />
<el-table-column prop="tray_qty" label="当前垛盘数" /> <el-table-column prop="tray_qty" label="当前垛盘数" />
<el-table-column prop="tray_high" label="垛盘高度" /> <el-table-column prop="tray_high" label="垛盘高度" />
<el-table-column prop="crib_category" label="垛型类别" /> <el-table-column prop="crib_category" label="垛型类别" />
@@ -286,7 +286,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import MaterDialog from '@/views/wms/st/in/MaterDialog' import MaterDialog from '@/views/wms/st/in/MaterDialog'
const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, AlongSide: null, BshortSide: null, Htrapezoidal: null, Wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, alongide: null, bshortside: null, htrapezoidal: null, wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null }
export default { export default {
name: 'Cribbinginfo', name: 'Cribbinginfo',
components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog }, components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },