This commit is contained in:
USER-20220102CG\noblelift
2022-07-15 19:34:53 +08:00
parent 80f1a8c384
commit 61c17454c5
4 changed files with 194 additions and 20 deletions

View File

@@ -107,6 +107,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
new_jo.put("lettering_icon", orderDteail_jo.getString("lettering_icon"));
new_jo.put("lettering_message", orderDteail_jo.getString("lettering_message"));
new_jo.put("lettering_message2", orderDteail_jo.getString("lettering_message2"));
new_jo.put("strap_number", orderDteail_jo.getString("strap_number"));
new_jo.put("labeling_template", orderDteail_jo.getString("labeling_template"));
new_jo.put("color_type", orderDteail_jo.getString("color_type"));
new_jo.put("type", "orderDteail");
new_jo.put("is_flag", "0");
children.add(new_jo);
@@ -216,6 +219,14 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
String temper = MapUtil.getStr(whereJson, "temper");
String length = MapUtil.getStr(whereJson, "length");
String is_strapping = MapUtil.getStr(whereJson, "is_strapping");
String is_risking = MapUtil.getStr(whereJson, "is_risking");
String is_labeling = MapUtil.getStr(whereJson, "is_labeling");
String is_coating = MapUtil.getStr(whereJson, "is_coating");
String is_lettering = MapUtil.getStr(whereJson, "is_lettering");
String feeding_mouth = MapUtil.getStr(whereJson, "feeding_mouth");
String qty = MapUtil.getStr(whereJson, "qty");
if(StrUtil.isEmpty(material_code)){
@@ -248,13 +259,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
orderDto.setOrder_status("00");
orderDto.setIs_deleted("0");
orderDto.setCreate_by(currentUsername);
orderDto.setIs_coating("1");
orderDto.setIs_labeling("1");
orderDto.setIs_lettering("1");
orderDto.setIs_risking("1");
orderDto.setIs_strapping("1");
orderDto.setIs_unbundling("1");
orderDto.setFeeding_mouth("3");
orderDto.setIs_coating(is_coating);
orderDto.setIs_labeling(is_labeling);
orderDto.setIs_lettering(is_lettering);
orderDto.setIs_risking(is_risking);
orderDto.setIs_strapping(is_strapping);
orderDto.setFeeding_mouth(feeding_mouth);
orderDto.setAlloy(alloy);
orderDto.setTemper(temper);
for(int i=0; i<tableData.size(); i++){