long
2023-09-02 e379948bb83ebcc9ce0c467a7b970f74bc00e9a1
修改日期
已修改3个文件
29 ■■■■ 文件已修改
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java
@@ -37,9 +37,9 @@
 */
@Service
public class ProductionOrdeInfoServiceImpl extends ServiceImpl<ProductionOrdeInfoMapper, ProductionOrdeInfo> implements ProductionOrdeInfoService {
    private static SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
  /*  private static SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
    private static String date = format.format(new Date());
    private static String orderDate = "M"+date;
    private static String orderDate = "M"+date;*/
    @Autowired
    private ProductionOrdeInfoService productionOrdeInfoService;
@@ -51,6 +51,10 @@
    @Override
    public void add(ProductionOrdeInfoParam param){
        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
        String date = format.format(new Date());
        String orderDate = "M"+date;
        List<ProductionOrdeInfo> workOrderNo = productionOrdeInfoService.list(new QueryWrapper<ProductionOrdeInfo>().like("work_order_no", date));
        if(workOrderNo.size() == 0){
            param.setWorkOrderNo(orderDate+"0001");
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java
@@ -11,10 +11,9 @@
    public static String productCompanyCode = ""; //产品公司编码
    public static String RunningWaterNumber = "0000"; //流水号
    public static String SerialNumbers = "0000"; //序列号
    public static Calendar calendar = Calendar.getInstance();
    public static String Years = String.valueOf(calendar.get(Calendar.YEAR)); //年份
 /*   public static String Years = String.valueOf(calendar.get(Calendar.YEAR)); //年份
    public static String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //月份
    public static String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //日期
    public static String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //日期*/
    //头部拼接
@@ -27,7 +26,9 @@
    public static String TAIL_STRING = "";//尾部拼接
    public static void main(String[] args){
        createCodingRulesSFC("1","1","1");
    }
    /**
     * 单体编号追溯
     * @param softwareVersionCode 软件版本编码(型号+扭矩+差异款+国家地区+软件版本)
@@ -37,7 +38,10 @@
     */
    public static String createCodingRulesSFC(String softwareVersionCode,String productCompanyCode,String serialNumbers){
        Calendar calendar = Calendar.getInstance();
        String Years = String.valueOf(calendar.get(Calendar.YEAR)); //年份
        String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //月份
        String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //日期
        StringBuffer result = new StringBuffer();
        String headString = "";
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java
@@ -30,6 +30,7 @@
import org.apache.log4j.Logger;
import org.springframework.boot.SpringApplication;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -175,7 +176,11 @@
            //序列号
            String serialNumbers = "0000";
            SerialNumbersConfParam serialNumbersConfParam = new SerialNumbersConfParam();
            serialNumbersConfParam.setYears(SFCCodeTool.Years+SFCCodeTool.Months+SFCCodeTool.Dates);//获取当前是哪一天
            Calendar calendar = Calendar.getInstance();
            String Years = String.valueOf(calendar.get(Calendar.YEAR)); //年份
            String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //月份
            String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //日期
            serialNumbersConfParam.setYears(Years+Months+Dates);//获取当前是哪一天
            serialNumbersConfParam.setState("1");
            SerialNumbersConfService serialNumbersConfService = opc.serialNumbersConfService;
            List<SerialNumbersConfResult> serialNumberslist = serialNumbersConfService.findListBySpec(serialNumbersConfParam);