fengyuan_yang
/
boying-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-04-14 

生产订单列表【删除】【取消】【关闭】【打开】功能优化
master
fengyuan_yang 2 days ago
parent
5012ea3d73
commit
296e9e24c2
4 changed files with 52 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
  2. 3
      src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
  3. 100
      src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
  4. 9
      src/main/resources/mapper/shopOrder/ShopOrderMapper.xml

9
src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
View File

@ -50,6 +50,15 @@ public class SearchScheduleData extends BaseData {
private Date planStartTime2;
private String calendarId;
private String username;
private String userName;
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
private String scheduledFlag;
private String closedFlag;//是否关闭 Y 是 N 否
private String rollNo;//当前上机卷的数据

3
src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
View File

@ -16,6 +16,7 @@ import org.springframework.stereotype.Repository;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@Mapper
@Repository
@ -201,7 +202,7 @@ public interface ShopOrderMapper {
* @return
* @throw
*/
void deleteShopOrderData(ShopOrderData inData);
Map<String, Object> deleteShopOrderData(ShopOrderData inData);
/**
* @Description 保存修改生产订单
* @Title saveShopOrderData

100
src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
View File

@ -200,17 +200,17 @@ public class ShopOrderServiceImpl implements ShopOrderService {
@Override
public ResponseData deleteShopOrderData(ShopOrderData inData) {
// 已下达或者 已计划的生产订单 都可以进行删除
ResponseData responseData = new ResponseData();
if (!inData.getStatus().equals("已下达") && !inData.getStatus().equals("已计划")) {
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200197));
responseData.setCode("500");
return responseData;
Map<String, Object> resultMap = shopOrderMapper.deleteShopOrderData(inData);
if (resultMap != null && "200".equals(String.valueOf(resultMap.get("resultCode")))) {
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg(String.valueOf(resultMap.get("resultMsg")));
} else {
responseData.setCode(resultMap != null ? String.valueOf(resultMap.get("resultCode")) : "500");
responseData.setSuccess(false);
responseData.setMsg(resultMap != null ? String.valueOf(resultMap.get("resultMsg")) : "删除失败");
}
shopOrderMapper.deleteShopOrderData(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -257,10 +257,11 @@ public class ShopOrderServiceImpl implements ShopOrderService {
public void cancelShopOrderBun(SearchScheduleData inData) {
//公共参数
String site = inData.getSite();
String buNo = inData.getBuNo();
String orderNo = inData.getOrderNo();
String status = inData.getStatus();
String userName = inData.getUserName();
//调用存储过程 执行取消订单的操作
Map<String, Object> resultMap = this.cancelShopOrder(site, orderNo, status);
Map<String, Object> resultMap = this.cancelShopOrder(site, buNo, orderNo, userName);
//判断是否检验成功
String resultCode = String.valueOf(resultMap.get("resultCode"));
if (!"200".equalsIgnoreCase(resultCode)) {
@ -275,15 +276,17 @@ public class ShopOrderServiceImpl implements ShopOrderService {
* @return void
* @author LR
* @date 2022/5/30 14:13
* @Param [site, orderNo, status]
* @Param [site, buNo, orderNo, userName]
**/
public Map<String, Object> cancelShopOrder(String site, String orderNo, String status) {
public Map<String, Object> cancelShopOrder(String site, String buNo, String orderNo, String userName) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(buNo);
params.add(orderNo);
params.add(status);
params.add(userName);
params.add("Cancel");
//调用存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelShopOrder", params);
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("UspDeleteShopOrder", params);
//处理返回的结果
return resultList.get(0);
}
@ -293,16 +296,11 @@ public class ShopOrderServiceImpl implements ShopOrderService {
public void closeShopOrder(SearchScheduleData inData) {
//公共参数
String site = inData.getSite();
String buNo = inData.getBuNo();
String orderNo = inData.getOrderNo();
String status = inData.getStatus();
boolean checkFlag = inData.isCheckFlag();
//关闭工单是否校验数量
String checkOrderQtyFlag = "Y";
if (!checkFlag) {
checkOrderQtyFlag = "N";
}
//调用存储过程 执行取消订单的操作
Map<String, Object> resultMap = this.closeShopOrder(site, orderNo, status, checkOrderQtyFlag);
String userName = inData.getUserName();
//调用存储过程 执行关闭订单的操作
Map<String, Object> resultMap = this.closeShopOrder(site, buNo, orderNo, userName);
//判断是否检验成功
String resultCode = String.valueOf(resultMap.get("resultCode"));
if (!"200".equalsIgnoreCase(resultCode)) {
@ -310,34 +308,8 @@ public class ShopOrderServiceImpl implements ShopOrderService {
String objectId = String.valueOf(resultMap.get("objectId"));
throw new XJException(msg, Integer.parseInt(resultCode), objectId);
}
//调用存储过程 关闭sap的订单
String currentTime = DateUtils.getStringDate(new Date(), "yyyy-MM-dd");
//调用存储过程 执行取消订单的操作
Map<String, Object> resultSapMap = this.closeSAPShopOrder(orderNo, currentTime);
//判断是否检验成功
String resultSapCode = String.valueOf(resultSapMap.get("resultCode"));
if (!"200".equalsIgnoreCase(resultSapCode)) {
String msg = String.valueOf(resultSapMap.get("resultMsg"));
String objectId = String.valueOf(resultSapMap.get("objectId"));
throw new XJException(msg, Integer.parseInt(resultCode), objectId);
}
}
/**
* @description: 关闭SAP的订单
* @author LR
* @date 2022/12/29 17:20
* @version 1.0
*/
public Map<String, Object> closeSAPShopOrder(String orderNo, String currentTime) {
List<Object> params = new ArrayList<>();
params.add(orderNo);
params.add(currentTime);
//调用存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("C_SAP_CloseSO", params);
//处理返回的结果
return resultList.get(0);
}
/**
* TODO 调用存储过程 执行关闭订单
@ -345,16 +317,17 @@ public class ShopOrderServiceImpl implements ShopOrderService {
* @return java.util.Map<java.lang.String, java.lang.Object>
* @author LR
* @date 2022/6/7 16:46
* @Param [site, orderNo, status, checkOrderQtyFlag]
* @Param [site, buNo, orderNo, userName]
**/
public Map<String, Object> closeShopOrder(String site, String orderNo, String status, String checkOrderQtyFlag) {
public Map<String, Object> closeShopOrder(String site, String buNo, String orderNo, String userName) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(buNo);
params.add(orderNo);
params.add(status);
params.add(checkOrderQtyFlag);
params.add(userName);
params.add("Close");
//调用存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("closeShopOrder", params);
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("UspDeleteShopOrder", params);
//处理返回的结果
return resultList.get(0);
}
@ -364,10 +337,11 @@ public class ShopOrderServiceImpl implements ShopOrderService {
public void openShopOrder(SearchScheduleData inData) {
//公共参数
String site = inData.getSite();
String buNo = inData.getBuNo();
String orderNo = inData.getOrderNo();
String status = inData.getStatus();
//调用存储过程 执行取消订单的操作
Map<String, Object> resultMap = this.openShopOrder(site, orderNo, status);
String userName = inData.getUserName();
//调用存储过程 执行打开订单的操作
Map<String, Object> resultMap = this.openShopOrder(site, buNo, orderNo, userName);
//判断是否检验成功
String resultCode = String.valueOf(resultMap.get("resultCode"));
if (!"200".equalsIgnoreCase(resultCode)) {
@ -382,15 +356,17 @@ public class ShopOrderServiceImpl implements ShopOrderService {
* @return java.util.Map<java.lang.String, java.lang.Object>
* @author LR
* @date 2022/6/7 16:51
* @Param [site, orderNo, status]
* @Param [site, buNo, orderNo, userName]
**/
public Map<String, Object> openShopOrder(String site, String orderNo, String status) {
public Map<String, Object> openShopOrder(String site, String buNo, String orderNo, String userName) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(buNo);
params.add(orderNo);
params.add(status);
params.add(userName);
params.add("Open");
//调用存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("openShopOrder", params);
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("UspDeleteShopOrder", params);
//处理返回的结果
return resultList.get(0);
}

9
src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
View File

@ -472,12 +472,9 @@
</where>
</select>
<delete id="deleteShopOrderData">
delete
from ShopOrder
where site = #{site}
and orderNo = #{orderNo}
</delete>
<select id="deleteShopOrderData" resultType="java.util.Map">
exec dbo.UspDeleteShopOrder #{site}, #{buNo}, #{orderNo}, #{userName}, 'Delete'
</select>
<delete id="deleteRouteInShopOrder">
delete
from SORouting

Write Preview
Loading…
Cancel
Save